From 71ed21efe5da30853db9baf560fe9b330b7b44e7 Mon Sep 17 00:00:00 2001 From: Xiangfu Liu Date: Tue, 3 Aug 2010 23:50:56 +0800 Subject: [PATCH] create debian branch only for make debian package. [master] branch is for the source code develop [debian] branch is for keep debian package code. becuase other system like gentoo arch doesn't need the "debian/" folder. Signed-off-by: Xiangfu Liu Acked-by: Li Danbing --- debian/.gitignore | 11 ---- debian/README.source | 23 ------- debian/autogen.sh | 17 ----- debian/changelog | 5 -- debian/changelog.upstream.awk | 113 --------------------------------- debian/clean.sh | 108 ------------------------------- debian/compat | 1 - debian/control | 21 ------ debian/copyright | 24 ------- debian/dirs | 3 - debian/docs | 2 - debian/get-orig-source.sh | 30 --------- debian/rules | 63 ------------------ debian/source/format | 1 - debian/source/include-binaries | 3 - debian/xburst-tools.manpages | 2 - 16 files changed, 427 deletions(-) delete mode 100644 debian/.gitignore delete mode 100644 debian/README.source delete mode 100755 debian/autogen.sh delete mode 100644 debian/changelog delete mode 100644 debian/changelog.upstream.awk delete mode 100644 debian/clean.sh delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/dirs delete mode 100644 debian/docs delete mode 100644 debian/get-orig-source.sh delete mode 100755 debian/rules delete mode 100644 debian/source/format delete mode 100644 debian/source/include-binaries delete mode 100644 debian/xburst-tools.manpages diff --git a/debian/.gitignore b/debian/.gitignore deleted file mode 100644 index e5c12ef..0000000 --- a/debian/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/stage1.bin -/xburst_stage1.bin -/xburst_stage2.bin -/changelog.upstream - -/files - -/*.debhelper.log -/*.substvars - -/xburst-tools diff --git a/debian/README.source b/debian/README.source deleted file mode 100644 index 6163fd4..0000000 --- a/debian/README.source +++ /dev/null @@ -1,23 +0,0 @@ -This Debian package is developed in a Git repository (see the Vcs-Git field -of debian/control). To build from a git checkout: - - debian/rules get-orig-source REPO=. BRANCH=remotes/origin/master - mv xburst-tools_*.tar.gz .. - debian/autogen.sh - debuild - -This requires a mipsel-openwrt-linux- cross-toolchain in your $PATH. You -can get one by building the development environment from Qi Hardware, for -example. - - git://projects.qi-hardware.com/openwrt-xburst.git xburst - -See the Qi Hardware wiki for details. - - http://en.qi-hardware.com/wiki/Building_Software_Image - -To build a released version of this package, no special instructions apply. -“dpkg-buildpackage” or “apt-get -b source xburst-tools” should work as -usual. - - -- Jonathan Nieder Mon, 05 Apr 2010 06:21:12 -0500 diff --git a/debian/autogen.sh b/debian/autogen.sh deleted file mode 100755 index 31d0bc2..0000000 --- a/debian/autogen.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# Generate debian/xburst_stage1.bin, debian/xburst_stage2.bin, -# and debian/changelog.upstream. -# -# Uses debian/changelog and the git revision log. -# -# Requires a mipsel-openwrt-linux- toolchain on the $PATH. - -set -e - -dpkg-parsechangelog --format rfc822 --all | - awk -f debian/changelog.upstream.awk - -debian/rules firmware -cp -f usbboot/xburst_stage1/xburst_stage1.bin debian/ -cp -f usbboot/xburst_stage2/xburst_stage2.bin debian/ -cp -f xbboot/target-stage1/stage1.bin debian/ diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 778413c..0000000 --- a/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -xburst-tools (0.0+201007-0.1) lucid; urgency=low - - * Initial release. (Closes: #535429) - - -- xiangfu Tue, 03 Aug 2010 00:01:38 +0800 diff --git a/debian/changelog.upstream.awk b/debian/changelog.upstream.awk deleted file mode 100644 index 6755ede..0000000 --- a/debian/changelog.upstream.awk +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/awk -f -# Generate debian/changelog.upstream from debian/changelog and -# the git revision log. Inspired by Gerrit Pape’s -# debian/changelog.upstream.sh, from the git-core Debian package. -# -# Requires a working /dev/stderr. -# -# Usage: -# dpkg-parsechangelog --format rfc822 --all | -# awk -f debian/changelog.upstream.awk - -# If argument matches /^Version: /, return remaining text. -# Result is nonempty if and only if argument matches. -function version_line(line) { - if (line ~ /^Version: /) { - sub(/^Version: /, "", line); - return line; - } - return ""; -} - -# If argument matches /^\*.* from commit /, return remaining text. -# Result is nonempty if and only if argument matches. -function commit_id_line(line) { - if (line ~ / from commit /) { - sub(/^.* from commit /, "", line); - sub(/[(][Cc]loses.*/, "", line); - sub(/[^0-9a-f]*$/, "", line); - return line; - } - return ""; -} - -# Read standard input, scanning for a changelog entry of the -# form “* New snapshot, taken from commit .” -# Result is . -# Result is empty and writes a message to standard error if no such entry is -# found before the next Version: line with a different upstream -# version (or EOF). -# Argument is the upstream version sought. -function read_commit_id(upstream, line,version,corresponding_upstream,commit) { - while (getline line) { - version = version_line(line); - corresponding_upstream = version; - sub(/-[^-]*$/, "", corresponding_upstream); - if (version != "" && corresponding_upstream != upstream) - break; - - commit = commit_id_line(line); - if (commit != "") - return commit; - } - - print "No commit id for " upstream >> "/dev/stderr"; - return ""; -} - -BEGIN { - last = "none"; - last_cid = "none"; - cl = "debian/changelog.upstream"; -} - -# Add a list of all revisions up to last to debian/changelog.upstream -# and set last = new_cid. -# new is a user-readable name for the commit new_cide. -function add_version(new,new_cid, limiter,versionline,command,line) { - if (last == "none") { - printf "" > cl; - last = new; - last_cid = new_cid; - return 0; - } - - if (new == "none") { - versionline = "Version " last; - limiter = ""; - } else { - versionline = "Version " last "; changes since " new ":"; - limiter = new_cid ".."; - } - print versionline >> cl; - gsub(/./, "-", versionline); - print versionline >> cl; - - print "" >> cl; - command = "git shortlog \"" limiter last_cid "\""; - while(command | getline line) - print line >> cl; - - if (new != "none") - print "" >> cl; - last = new; - last_cid = new_cid; -} - -{ - version = version_line($0); - if (version != "") { - # strip Debian revision - upstream_version = version; - sub(/-[^-]*$/, "", upstream_version); - - commit = read_commit_id(upstream_version); - if (commit == "") - exit 1; - add_version(upstream_version, commit); - } -} - -END { - add_version("none", "none"); -} diff --git a/debian/clean.sh b/debian/clean.sh deleted file mode 100644 index 1b17a8b..0000000 --- a/debian/clean.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh -# Clean up after a failed build. -# -# Requires access to .gitignore files excluding _all_ modified files. -# -# Requires a working /dev/fd (with more than just /dev/fd/0 and 1) -# or gawk. - -set -e - -splitgitignore='#!/usr/bin/awk -!/^#/ && !/^$/ { - glob = /[[*?]/; - directory = /\/$/; - sub(/\/$/, ""); - anchored = /\//; - sub(/^\//, ""); - - output = "nonexistent/nonsense"; - if (anchored) { - if (!directory && !glob) - output = "/dev/fd/1"; - else if (directory && !glob) - output = "/dev/fd/3"; - else if (!directory && glob) - output = "/dev/fd/4"; - else if (directory && glob) - output = "/dev/fd/5"; - } else { - if (!directory) - output = "/dev/fd/6"; - else - output = "/dev/fd/7"; - } - print >> output; -} -' - -offlimits="-type d -name '.*' -prune -o -type d -name debian -prune" - -remove_file_globs() { - while read glob - do - eval "rm -f $glob" - done -} - -remove_directory_globs() { - while read glob - do - eval "rm -fr $glob" - done -} - -remove_file_findpatterns() { - while read pat - do - find . $offlimits -o \ - '(' -name "$pat" -execdir rm -f '{}' + ')' - done -} - -remove_directory_findpatterns() { - while read pat - do - find . $offlimits -o \ - '(' -type d -name "$pat" -execdir rm -fr '{}' + ')' - done -} - -find . $offlimits -o '(' -name .gitignore -print ')' | -while read file -do - ( - cd "$(dirname "$file")" - # Dispatch using pipes. Yuck. - { { { { { - awk "$splitgitignore" | - { - # anchored files (globless) - xargs -d '\n' rm -f - } - } 3>&1 >&2 | - { - # anchored directories (globless) - xargs -d '\n' rm -fr - } - } 4>&1 >&2 | - { - # anchored files - remove_file_globs - } - } 5>&1 >&2 | - { - # anchored directories - remove_directory_globs - } - } 6>&1 >&2 | - { - # unanchored files - remove_file_findpatterns - } - } 7>&1 >&2 | - { - remove_directory_findpatterns - } >&2 - ) < "$file" -done diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7f8f011..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/debian/control b/debian/control deleted file mode 100644 index b91c5a4..0000000 --- a/debian/control +++ /dev/null @@ -1,21 +0,0 @@ -Source: xburst-tools -Section: misc -Priority: extra -Maintainer: Xiangfu Liu -Build-Depends: debhelper (>= 7.4.10), - pkg-config, autoconf, automake, - libusb-dev, libconfuse-dev -Build-Conflicts: automake1.4 -Standards-Version: 3.8.4 -Vcs-Git: git://projects.qi-hardware.com/xburst-tools.git -Vcs-Browser: http://projects.qi-hardware.com/index.php/p/xburst-tools/source/changes/master/ -Homepage: http://projects.qi-hardware.com/index.php/p/xburst-tools/ - -Package: xburst-tools -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: tools for Ingenic XBurst CPU USB boot and NAND flash access - xburst-tools contains tools for Ingenic XBurst CPU device booting. - It can flash bootloader, kernel, rootfs to Ingenic XBurst CPU - device NAND, and also has test functions for Ingenic XBurst CPU - devices. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 9a63629..0000000 --- a/debian/copyright +++ /dev/null @@ -1,24 +0,0 @@ -This package was debianized by Xiangfu Liu on -Mon, 22 Jun 2009 22:48:14 +0800. - -It was downloaded from - -Upstream Author: Xiangfu Liu and - Wolfgang Spraul - Marek Lindner - Ingenic Semiconductor Inc. - Lucifer at Ingenic Semiconductor Inc. - Seeger Chin - - -The Debian packaging is copyright 2009, 2010 - Xiangfu Liu and - Jonathan Nieder -is licensed under the GPL, see `/usr/share/common-licenses/GPL-3'. - -You are free to distribute this software under the terms of -the GNU General Public License either version 3 of the License, -or (at your option) any later version. -On Debian systems, the complete text of the GNU General Public -License can be found in the file `/usr/share/common-licenses/GPL-3'. - diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index b5e7d25..0000000 --- a/debian/dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/share/xburst-tools -etc/xburst-tools diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 5715281..0000000 --- a/debian/docs +++ /dev/null @@ -1,2 +0,0 @@ -usbboot/README.usbboot -xbboot/README.xbboot diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh deleted file mode 100644 index ed57486..0000000 --- a/debian/get-orig-source.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# Build a tarball from the latest upstream version, with a nice -# version number. -# -# Requires git 1.6.6 or later, GNU date, and gzip. - -set -e - -: ${REPO=$(git rev-parse --git-dir)} -: ${BRANCH=remotes/origin/master} - -mkdir debian-orig-source -trap 'rm -fr debian-orig-source || exit 1' EXIT INT TERM - -git init -q debian-orig-source -GIT_DIR=$(pwd)/debian-orig-source/.git -export GIT_DIR - -# Fetch latest upstream version. -git fetch -q "$REPO" "$BRANCH" - -# Determine version number. -release=0.0 -date=$(date --utc --date="$(git log -1 --pretty=format:%cD FETCH_HEAD)" "+%Y%m") -upstream_version="${release}+${date}" - -# Generate tarball. -echo "packaging $(git rev-parse --short FETCH_HEAD)" -git archive FETCH_HEAD | - gzip -n -9 >"xburst-tools_$upstream_version.orig.tar.gz" diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 9c8e503..0000000 --- a/debian/rules +++ /dev/null @@ -1,63 +0,0 @@ -#!/usr/bin/make -f -# This file is in the public domain. -# You may freely use, modify, distribute, and relicense it. - -build clean install binary-arch binary-indep binary: - +dh --parallel $(opt_no_act) $@ - -override_dh_auto_clean: - test -e debian/xburst_stage1.bin || { \ - echo >&2 see debian/README.source; \ - exit 1; \ - } - dh_auto_clean - sh debian/clean.sh - -override_dh_auto_configure: configure - dh_auto_configure -- $(opt_optimize) $(opt_quiet) \ - --disable-firmware LDFLAGS=-Wl,-z,defs - -override_dh_auto_install: - dh_auto_install - : install firmware from source package - dh_install debian/xburst_stage1.bin usr/share/xburst-tools/ - dh_install debian/xburst_stage2.bin usr/share/xburst-tools/ - dh_install debian/stage1.bin usr/share/xburst-tools/ - -override_dh_installchangelogs: - dh_installchangelogs debian/changelog.upstream - -opt_optimize = CFLAGS="-g -O2" -opt_no_act = -opt_quiet = - -ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - opt_optimize = CFLAGS="-g -O0" -endif - -ifneq (,$(findstring n,$(MAKEFLAGS))) - opt_no_act = --no-act -endif - -ifneq (,$(filter quiet,$(DEB_BUILD_OPTIONS))) - opt_quiet = --quiet - MAKEFLAGS += --quiet -endif - -configure: configure.ac - AUTOMAKE="automake --foreign" autoreconf -is - -firmware: configure - ./configure --enable-firmware - $(MAKE) -C usbboot/src \ - ../xburst_stage1/xburst_stage1.bin \ - ../xburst_stage2/xburst_stage2.bin - $(MAKE) -C xbboot/host-app \ - ../target-stage1/stage1.bin - -REPO = git://projects.qi-hardware.com/xburst-tools.git -BRANCH = master -debiandir_SQ = $(subst ','\'',$(dir $(lastword $(MAKEFILE_LIST)))) -get-orig-source: - REPO='$(REPO)' BRANCH='$(BRANCH)' \ - sh '$(debiandir_SQ)'get-orig-source.sh diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/source/include-binaries b/debian/source/include-binaries deleted file mode 100644 index cfe0ab5..0000000 --- a/debian/source/include-binaries +++ /dev/null @@ -1,3 +0,0 @@ -debian/xburst_stage1.bin -debian/xburst_stage2.bin -debian/stage1.bin diff --git a/debian/xburst-tools.manpages b/debian/xburst-tools.manpages deleted file mode 100644 index 010a4ff..0000000 --- a/debian/xburst-tools.manpages +++ /dev/null @@ -1,2 +0,0 @@ -./usbboot/doc/usbboot.1 -./xbboot/doc/xbboot.1