diff options
author | Eric Andersen <andersen@codepoet.org> | 2000-12-01 19:55:04 +0000 |
---|---|---|
committer | Eric Andersen <andersen@codepoet.org> | 2000-12-01 19:55:04 +0000 |
commit | e2f6e1221330f2944d467cad2fb630deb5ef6f0a (patch) | |
tree | f52409c3b56c1f2a5a54996dc2542c7941574e20 /debian | |
parent | 09a34e536896ecbe3e81618c7a45f9f1998bd8aa (diff) | |
download | busybox-w32-e2f6e1221330f2944d467cad2fb630deb5ef6f0a.tar.gz busybox-w32-e2f6e1221330f2944d467cad2fb630deb5ef6f0a.tar.bz2 busybox-w32-e2f6e1221330f2944d467cad2fb630deb5ef6f0a.zip |
More pristine source directory updates. It now works
for me (including doing install). How about you?
-Erik
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 4 | ||||
-rw-r--r-- | debian/control | 36 | ||||
-rwxr-xr-x | debian/rules | 60 |
3 files changed, 85 insertions, 15 deletions
diff --git a/debian/changelog b/debian/changelog index c1c9cb2bd..3300927e8 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -1,6 +1,8 @@ | |||
1 | busybox (0.48pre-1) unstable; urgency=low | 1 | busybox (0.48pre-1) unstable; urgency=low |
2 | 2 | ||
3 | * New version released. See changelog for details. | 3 | * Non-release. |
4 | * See changelog for details. | ||
5 | * Now includes .udeb support for the debian-installer. | ||
4 | 6 | ||
5 | -- Erik Andersen <andersee@debian.org> Mon, 25 Sep 2000 23:00:56 -0600 | 7 | -- Erik Andersen <andersee@debian.org> Mon, 25 Sep 2000 23:00:56 -0600 |
6 | 8 | ||
diff --git a/debian/control b/debian/control index bbbf86e09..54475b799 100644 --- a/debian/control +++ b/debian/control | |||
@@ -1,16 +1,16 @@ | |||
1 | Source: busybox | 1 | Source: busybox |
2 | Priority: optional | 2 | Priority: optional |
3 | Maintainer: Erik Andersen <andersee@debian.org> | 3 | Maintainer: Erik Andersen <andersee@debian.org> |
4 | Build-Depends: debhelper | 4 | Build-Depends: debhelper (>= 2.1.18), dpkg-dev (1.7.0) |
5 | Standards-Version: 3.1.1 | 5 | Standards-Version: 3.2.1.0 |
6 | 6 | ||
7 | Package: busybox | 7 | Package: busybox |
8 | Architecture: any | 8 | Architecture: any |
9 | Depends: ${shlibs:Depends} | 9 | Depends: ${shlibs:Depends} |
10 | Conflicts: binutils, bsdutils, console-tools, cpio, debianutils, dnsutils, dpkg, fbset, fdflush, fileutils, grep, gzip, hostname, modutils, mount, netbase, procps, psmisc, sed, sharutils, shellutils, sysklogd, sysvinit, tar, textutils, update, util-linux | 10 | Conflicts: |
11 | Replaces: netbase | 11 | Replaces: |
12 | Section: utils | 12 | Section: utils |
13 | Description: Tiny utilities for the debian-installer and for embedded systems. | 13 | Description: Tiny utilities for small and embedded systems. |
14 | BusyBox combines tiny versions of many common UNIX utilities into a single | 14 | BusyBox combines tiny versions of many common UNIX utilities into a single |
15 | small executable. It provides minimalist replacements for the most common | 15 | small executable. It provides minimalist replacements for the most common |
16 | utilities you would usually find on your desktop system (i.e. ls, cp, mv, | 16 | utilities you would usually find on your desktop system (i.e. ls, cp, mv, |
@@ -19,10 +19,10 @@ Description: Tiny utilities for the debian-installer and for embedded systems. | |||
19 | provide the expected functionality and behave very much like their GNU | 19 | provide the expected functionality and behave very much like their GNU |
20 | counterparts. | 20 | counterparts. |
21 | . | 21 | . |
22 | BusyBox is used by the debian-installer. Installing BusyBox onto your Debian | 22 | This package installs the BusyBox binary but does not install symlinks |
23 | system is not recommended, unless you are intended to make a very small | 23 | for any of the supported utilities. You can use /bin/busybox --install |
24 | embedded system. Chances are good that for embedded systems, you will want to | 24 | to install BusyBox to the current directory (you do not want to do this |
25 | recompile to only include the tools and utilities you wish to include. | 25 | in / on your Debian system!). |
26 | 26 | ||
27 | Package: busybox-static | 27 | Package: busybox-static |
28 | Architecture: any | 28 | Architecture: any |
@@ -44,3 +44,21 @@ Description: Provides a stand alone rescue shell with tons of builtin utilities. | |||
44 | your system from certain destruction. Invoke "busybox", and it will list the | 44 | your system from certain destruction. Invoke "busybox", and it will list the |
45 | available builtin commands. | 45 | available builtin commands. |
46 | 46 | ||
47 | Package: busybox-udeb | ||
48 | Architecture: any | ||
49 | Depends: ${shlibs:Depends} | ||
50 | Section: debian-installer | ||
51 | Description: Tiny utilities for the debian-installer and for embedded systems. | ||
52 | BusyBox combines tiny versions of many common UNIX utilities into a single | ||
53 | small executable. It provides minimalist replacements for the most common | ||
54 | utilities you would usually find on your desktop system (i.e. ls, cp, mv, | ||
55 | mount, tar, etc). The utilities in BusyBox generally have fewer options than | ||
56 | their full-featured GNU cousins; however, the options that are included | ||
57 | provide the expected functionality and behave very much like their GNU | ||
58 | counterparts. | ||
59 | . | ||
60 | BusyBox is used by the debian-installer. Installing BusyBox onto your Debian | ||
61 | system is not recommended, unless you are intended to make a very small | ||
62 | embedded system. Chances are good that for embedded systems, you will want to | ||
63 | recompile to only include the tools and utilities you wish to include. | ||
64 | |||
diff --git a/debian/rules b/debian/rules index ffa9b5c36..67741b19f 100755 --- a/debian/rules +++ b/debian/rules | |||
@@ -8,14 +8,23 @@ | |||
8 | export DH_COMPAT=1 | 8 | export DH_COMPAT=1 |
9 | 9 | ||
10 | bb=debian/tmp | 10 | bb=debian/tmp |
11 | bbbd=debian/bb_builddir | ||
11 | bbs=debian/busybox-static | 12 | bbs=debian/busybox-static |
13 | bbsbd=debian/bb-static_builddir | ||
14 | |||
15 | #For the debian-installer .udeb package | ||
16 | PACKAGE=busybox-udeb | ||
17 | VERSION=$(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2) | ||
18 | ARCH=$(shell dpkg --print-architecture) | ||
19 | FILENAME=$(PACKAGE)_$(VERSION)_$(ARCH).udeb | ||
20 | PRIORITY=$(shell grep ^Priority: debian/control | cut -d ' ' -f 2) | ||
12 | 21 | ||
13 | clean: | 22 | clean: |
14 | dh_testdir | 23 | dh_testdir |
15 | dh_testroot | 24 | dh_testroot |
16 | rm -f build-stamp-busybox build-stamp-busybox-static | 25 | rm -f build-stamp-busybox build-stamp-busybox-static |
17 | -$(MAKE) clean | 26 | -$(MAKE) clean |
18 | -rm -rf $(bb) $(bbs) | 27 | -rm -rf $(bb) $(bbbd) $(bbs) $(bbsbd) |
19 | dh_clean | 28 | dh_clean |
20 | 29 | ||
21 | half_clean: | 30 | half_clean: |
@@ -27,7 +36,9 @@ half_clean: | |||
27 | build: build-stamp-busybox | 36 | build: build-stamp-busybox |
28 | build-stamp-busybox: | 37 | build-stamp-busybox: |
29 | dh_testdir | 38 | dh_testdir |
30 | $(MAKE) | 39 | mkdir -p $(bbbd) |
40 | cp Makefile Config.h $(bbbd) | ||
41 | (cd $(bbbd); $(MAKE) "BB_SRC_DIR=../../") | ||
31 | touch build-stamp-busybox | 42 | touch build-stamp-busybox |
32 | 43 | ||
33 | install: build | 44 | install: build |
@@ -35,7 +46,7 @@ install: build | |||
35 | dh_testroot | 46 | dh_testroot |
36 | dh_clean -k | 47 | dh_clean -k |
37 | dh_installdirs | 48 | dh_installdirs |
38 | $(MAKE) "PREFIX=$(bb)" install | 49 | (cd $(bbbd); $(MAKE) "BB_SRC_DIR=../../" "PREFIX=../../$(bb)" install) |
39 | mkdir -p $(bb)/usr/share/man/man1 | 50 | mkdir -p $(bb)/usr/share/man/man1 |
40 | cp docs/BusyBox.1 $(bb)/usr/share/man/man1/busybox.1 | 51 | cp docs/BusyBox.1 $(bb)/usr/share/man/man1/busybox.1 |
41 | 52 | ||
@@ -67,7 +78,7 @@ binary-indep: | |||
67 | # We have nothing to do by default. | 78 | # We have nothing to do by default. |
68 | 79 | ||
69 | # Build architecture-dependent files here. | 80 | # Build architecture-dependent files here. |
70 | binary-arch: busybox busybox-static | 81 | binary-arch: busybox busybox-static busybox-udeb |
71 | 82 | ||
72 | busybox: install | 83 | busybox: install |
73 | @echo "--- Building: $@" | 84 | @echo "--- Building: $@" |
@@ -87,7 +98,7 @@ busybox: install | |||
87 | # $(bb)/usr/share/doc/busybox/busybox.lineo.com/images/CVS \ | 98 | # $(bb)/usr/share/doc/busybox/busybox.lineo.com/images/CVS \ |
88 | # $(bb)/usr/share/doc/busybox/busybox.lineo.com/images/.cvsignore | 99 | # $(bb)/usr/share/doc/busybox/busybox.lineo.com/images/.cvsignore |
89 | #dh_undocumented -p$@ | 100 | #dh_undocumented -p$@ |
90 | dh_installchangelogs -p$@ Changelog | 101 | #dh_installchangelogs -p$@ Changelog |
91 | dh_strip -p$@ | 102 | dh_strip -p$@ |
92 | dh_compress -p$@ | 103 | dh_compress -p$@ |
93 | dh_fixperms -p$@ | 104 | dh_fixperms -p$@ |
@@ -126,5 +137,44 @@ busybox-static: do_static | |||
126 | dh_builddeb -p$@ | 137 | dh_builddeb -p$@ |
127 | 138 | ||
128 | 139 | ||
140 | # Note that this builds a .udeb, which is not policy compliant or anything. | ||
141 | # | ||
142 | busybox-udeb: install | ||
143 | @echo "--- Building: $@" | ||
144 | dh_testdir | ||
145 | dh_testroot | ||
146 | dh_installdirs | ||
147 | # | ||
148 | #Note that for busybox, we do not install any docs, | ||
149 | # or man apges or anything else. This is in blatent violation of every | ||
150 | # Debian policy out there, since this package is intended to be used | ||
151 | # _only_ by the debian-installer. | ||
152 | # | ||
153 | #dh_installdocs -p$@ docs/BusyBox.txt \ | ||
154 | # docs/BusyBox.html docs/busybox.lineo.com AUTHORS README TODO | ||
155 | #rm -rf $(bb)/usr/share/doc/busybox/busybox.lineo.com/CVS \ | ||
156 | # $(bb)/usr/share/doc/busybox/busybox.lineo.com/.cvsignore \ | ||
157 | # $(bb)/usr/share/doc/busybox/busybox.lineo.com/images/CVS \ | ||
158 | # $(bb)/usr/share/doc/busybox/busybox.lineo.com/images/.cvsignore | ||
159 | #dh_undocumented -p$@ | ||
160 | #dh_installchangelogs -p$@ Changelog | ||
161 | dh_strip -p$@ | ||
162 | dh_compress -p$@ | ||
163 | dh_fixperms -p$@ | ||
164 | dh_installdeb -p$@ | ||
165 | dh_shlibdeps -p$@ | ||
166 | # | ||
167 | #Make _very_ sure there are no docs lurking about. | ||
168 | # | ||
169 | rm -rf $(bb)/usr/share/doc | ||
170 | rm -rf $(bb)/usr/share/man | ||
171 | dh_gencontrol -p$@ | ||
172 | # Don't write your stupid guesses to debian/files. | ||
173 | #dh_gencontrol -p$@ -- -fdebian/files~ | ||
174 | # Register file manually. | ||
175 | dpkg-distaddfile $(FILENAME) debian-installer $(PRIORITY) | ||
176 | dh_md5sums -p$@ | ||
177 | dh_builddeb -p$@ --filename=$(FILENAME) | ||
178 | |||
129 | binary: binary-indep binary-arch | 179 | binary: binary-indep binary-arch |
130 | .PHONY: build clean binary-indep binary-arch binary install | 180 | .PHONY: build clean binary-indep binary-arch binary install |