diff options
| -rw-r--r-- | debian/busybox-cvs-static.dirs | 1 | ||||
| -rw-r--r-- | debian/config-deb | 52 | ||||
| -rw-r--r-- | debian/config-static | 74 | ||||
| -rw-r--r-- | debian/config-udeb | 57 | ||||
| -rw-r--r-- | debian/control | 18 | ||||
| -rw-r--r-- | debian/copyright | 21 | ||||
| -rwxr-xr-x | debian/rules | 56 |
7 files changed, 190 insertions, 89 deletions
diff --git a/debian/busybox-cvs-static.dirs b/debian/busybox-cvs-static.dirs index ba077a403..f08836524 100644 --- a/debian/busybox-cvs-static.dirs +++ b/debian/busybox-cvs-static.dirs @@ -1 +1,2 @@ bin +usr/share/lintian/overrides diff --git a/debian/config-deb b/debian/config-deb index 0108108cd..bb71c1aa6 100644 --- a/debian/config-deb +++ b/debian/config-deb @@ -1,9 +1,9 @@ # -# Automatically generated by make menuconfig: don't edit +# Automatically generated make config: don't edit # # -# BusyBox general settings +# General Configuration # # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y @@ -17,6 +17,14 @@ CONFIG_FEATURE_INSTALLER=y # CONFIG_FEATURE_SUID is not set # +# Build Options +# +# DOSTATIC is not set +# DOLFS is not set +# USING_CROSS_COMPILER is not set +EXTRA_CFLAGS_OPTIONS="" + +# # Archival Utilities # CONFIG_AR=y @@ -96,8 +104,20 @@ CONFIG_RM=y CONFIG_RMDIR=y CONFIG_SYNC=y CONFIG_TOUCH=y + +# +# Common options for cp and mv +# # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set + +# +# Common options for ls and more +# CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# CONFIG_FEATURE_HUMAN_READABLE=y # @@ -179,6 +199,10 @@ CONFIG_FEATURE_IFCONFIG_HW=y # CONFIG_IFUPDOWN is not set # CONFIG_IP is not set # CONFIG_IPCALC is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set # CONFIG_NC is not set # CONFIG_NETSTAT is not set # CONFIG_NSLOOKUP is not set @@ -198,7 +222,6 @@ CONFIG_FEATURE_WGET_AUTHENTICATION=y # # CONFIG_UDHCPD is not set # CONFIG_UDHCPC is not set -# CONFIG_DUMPLEASES is not set # # Process Utilities @@ -208,7 +231,6 @@ CONFIG_KILL=y CONFIG_KILLALL=y # CONFIG_PIDOF is not set CONFIG_PS=y -# CONFIG_FEATURE_USE_DEVPS_PATCH is not set # CONFIG_RENICE is not set # CONFIG_TOP is not set CONFIG_UPTIME=y @@ -225,13 +247,6 @@ CONFIG_FEATURE_SH_IS_NONE=y # CONFIG_HUSH is not set # CONFIG_LASH is not set # CONFIG_MSH is not set -# CONFIG_FEATURE_COMMAND_EDITING is not set -# CONFIG_FEATURE_COMMAND_TAB_COMPLETION is not set -# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set -# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set -# CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN is not set -# CONFIG_FEATURE_SH_FANCY_PROMPT is not set -# CONFIG_FEATURE_SH_EXTRA_QUIET is not set # # Shell Utilities @@ -311,14 +326,25 @@ CONFIG_LOSETUP=y CONFIG_MKSWAP=y CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for ls and more +# # CONFIG_PIVOT_ROOT is not set # CONFIG_RDATE is not set CONFIG_SWAPONOFF=y CONFIG_MOUNT=y CONFIG_NFSMOUNT=y -# CONFIG_FEATURE_USE_DEVPS_PATCH is not set CONFIG_UMOUNT=y CONFIG_FEATURE_MOUNT_FORCE=y + +# +# Common options for mount/umount +# CONFIG_FEATURE_MOUNT_LOOP=y # CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Debugging Options +# +# DODEBUG is not set diff --git a/debian/config-static b/debian/config-static index cecefa452..f910569aa 100644 --- a/debian/config-static +++ b/debian/config-static @@ -1,9 +1,9 @@ # -# Automatically generated by make menuconfig: don't edit +# Automatically generated make config: don't edit # # -# BusyBox general settings +# General Configuration # # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y @@ -17,6 +17,14 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_SUID is not set # +# Build Options +# +DOSTATIC=y +# DOLFS is not set +# USING_CROSS_COMPILER is not set +EXTRA_CFLAGS_OPTIONS="" + +# # Archival Utilities # CONFIG_AR=y @@ -110,8 +118,20 @@ CONFIG_RM=y CONFIG_RMDIR=y CONFIG_SYNC=y CONFIG_TOUCH=y + +# +# Common options for cp and mv +# CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls and more +# CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# CONFIG_FEATURE_HUMAN_READABLE=y # @@ -197,6 +217,7 @@ CONFIG_IFUPDOWN=y CONFIG_FEATURE_IFUPDOWN_IPV4=y CONFIG_FEATURE_IFUPDOWN_IPV6=y CONFIG_FEATURE_IFUPDOWN_IPX=y +# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set CONFIG_IP=y CONFIG_FEATURE_IP_ADDRESS=y CONFIG_FEATURE_IP_LINK=y @@ -204,6 +225,10 @@ CONFIG_FEATURE_IP_ROUTE=y CONFIG_FEATURE_IP_TUNNEL=y CONFIG_IPCALC=y CONFIG_FEATURE_IPCALC_FANCY=y +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set CONFIG_NC=y CONFIG_NETSTAT=y CONFIG_NSLOOKUP=y @@ -235,6 +260,7 @@ CONFIG_UDHCPC=y CONFIG_DUMPLEASES=y CONFIG_FEATURE_UDHCP_SYSLOG=y CONFIG_FEATURE_UDHCP_DEBUG=y +CONFIG_FEATURE_UDHCPC_IP=y # # Process Utilities @@ -244,7 +270,6 @@ CONFIG_KILL=y CONFIG_KILLALL=y CONFIG_PIDOF=y CONFIG_PS=y -# CONFIG_FEATURE_USE_DEVPS_PATCH is not set CONFIG_RENICE=y CONFIG_TOP=y FEATURE_CPU_USAGE_PERCENTAGE=y @@ -259,7 +284,14 @@ CONFIG_FEATURE_SH_IS_ASH=y # CONFIG_FEATURE_SH_IS_MSH is not set # CONFIG_FEATURE_SH_IS_NONE is not set CONFIG_ASH=y -CONFIG_ASH=y + +# +# ash (forced enabled as default shell) +# + +# +# Ash Shell Options +# CONFIG_ASH_JOB_CONTROL=y CONFIG_ASH_ALIAS=y CONFIG_ASH_MATH_SUPPORT=y @@ -267,12 +299,18 @@ CONFIG_ASH_GETOPTS=y CONFIG_ASH_CMDCMD=y CONFIG_ASH_MAIL=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set # CONFIG_HUSH is not set # CONFIG_LASH is not set # CONFIG_MSH is not set + +# +# Bourne Shell Options +# CONFIG_FEATURE_COMMAND_EDITING=y CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION=y +CONFIG_FEATURE_COMMAND_HISTORY=15 CONFIG_FEATURE_SH_STANDALONE_SHELL=y CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN=y CONFIG_FEATURE_SH_FANCY_PROMPT=y @@ -285,6 +323,10 @@ CONFIG_BASENAME=y CONFIG_CAL=y CONFIG_CHROOT=y CONFIG_DATE=y + +# +# date (forced enabled for use with watch) +# CONFIG_FEATURE_DATE_ISOFMT=y CONFIG_DIRNAME=y CONFIG_ECHO=y @@ -301,11 +343,14 @@ CONFIG_STTY=y CONFIG_TEE=y CONFIG_TRUE=y CONFIG_TEST=y + +# +# test (forced enabled for use with shell) +# CONFIG_TTY=y CONFIG_UNAME=y CONFIG_USLEEP=y CONFIG_WATCH=y -CONFIG_DATE=y CONFIG_WHO=y CONFIG_WHOAMI=y CONFIG_YES=y @@ -354,6 +399,10 @@ CONFIG_FDFLUSH=y CONFIG_FREERAMDISK=y CONFIG_FSCK_MINIX=y CONFIG_MKFS_MINIX=y + +# +# Minix filesystem support +# CONFIG_FEATURE_MINIX2=y CONFIG_GETOPT=y CONFIG_HEXDUMP=y @@ -363,14 +412,25 @@ CONFIG_LOSETUP=y CONFIG_MKSWAP=y CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for ls and more +# CONFIG_PIVOT_ROOT=y CONFIG_RDATE=y CONFIG_SWAPONOFF=y CONFIG_MOUNT=y CONFIG_NFSMOUNT=y -# CONFIG_FEATURE_USE_DEVPS_PATCH is not set CONFIG_UMOUNT=y CONFIG_FEATURE_MOUNT_FORCE=y + +# +# Common options for mount/umount +# CONFIG_FEATURE_MOUNT_LOOP=y CONFIG_FEATURE_MTAB_SUPPORT=y + +# +# Debugging Options +# +# DODEBUG is not set diff --git a/debian/config-udeb b/debian/config-udeb index 8376ed090..2562da0ed 100644 --- a/debian/config-udeb +++ b/debian/config-udeb @@ -1,9 +1,9 @@ # -# Automatically generated by make menuconfig: don't edit +# Automatically generated make config: don't edit # # -# BusyBox general settings +# General Configuration # # CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y @@ -17,6 +17,14 @@ CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_SUID is not set # +# Build Options +# +# DOSTATIC is not set +# DOLFS is not set +# USING_CROSS_COMPILER is not set +EXTRA_CFLAGS_OPTIONS="" + +# # Archival Utilities # CONFIG_AR=y @@ -96,8 +104,20 @@ CONFIG_RM=y CONFIG_RMDIR=y CONFIG_SYNC=y CONFIG_TOUCH=y + +# +# Common options for cp and mv +# CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Common options for ls and more +# CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for df, du, ls +# CONFIG_FEATURE_HUMAN_READABLE=y # @@ -178,6 +198,10 @@ CONFIG_FEATURE_IP_LINK=y CONFIG_FEATURE_IP_ROUTE=y # CONFIG_FEATURE_IP_TUNNEL is not set # CONFIG_IPCALC is not set +# CONFIG_IPADDR is not set +# CONFIG_IPLINK is not set +# CONFIG_IPROUTE is not set +# CONFIG_IPTUNNEL is not set # CONFIG_NC is not set # CONFIG_NETSTAT is not set # CONFIG_NSLOOKUP is not set @@ -197,8 +221,10 @@ CONFIG_FEATURE_WGET_STATUSBAR=y # udhcp Server/Client # # CONFIG_UDHCPD is not set -# CONFIG_UDHCPC is not set -# CONFIG_DUMPLEASES is not set +CONFIG_UDHCPC=y +CONFIG_FEATURE_UDHCP_SYSLOG=y +# CONFIG_FEATURE_UDHCP_DEBUG is not set +CONFIG_FEATURE_UDHCPC_IP=y # # Process Utilities @@ -208,7 +234,6 @@ CONFIG_KILL=y # CONFIG_KILLALL is not set CONFIG_PIDOF=y CONFIG_PS=y -# CONFIG_FEATURE_USE_DEVPS_PATCH is not set # CONFIG_RENICE is not set # CONFIG_TOP is not set # CONFIG_UPTIME is not set @@ -225,13 +250,6 @@ CONFIG_FEATURE_SH_IS_NONE=y # CONFIG_HUSH is not set # CONFIG_LASH is not set # CONFIG_MSH is not set -CONFIG_FEATURE_COMMAND_EDITING=y -CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y -# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set -# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set -# CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN is not set -# CONFIG_FEATURE_SH_FANCY_PROMPT is not set -# CONFIG_FEATURE_SH_EXTRA_QUIET is not set # # Shell Utilities @@ -311,14 +329,25 @@ CONFIG_FREERAMDISK=y CONFIG_MKSWAP=y CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_FEATURE_AUTOWIDTH=y + +# +# Common options for ls and more +# CONFIG_PIVOT_ROOT=y # CONFIG_RDATE is not set CONFIG_SWAPONOFF=y CONFIG_MOUNT=y CONFIG_NFSMOUNT=y -# CONFIG_FEATURE_USE_DEVPS_PATCH is not set CONFIG_UMOUNT=y CONFIG_FEATURE_MOUNT_FORCE=y + +# +# Common options for mount/umount +# CONFIG_FEATURE_MOUNT_LOOP=y # CONFIG_FEATURE_MTAB_SUPPORT is not set + +# +# Debugging Options +# +# DODEBUG is not set diff --git a/debian/control b/debian/control index 5b9f8f676..f2110f922 100644 --- a/debian/control +++ b/debian/control @@ -1,15 +1,9 @@ Source: busybox-cvs Priority: optional -Maintainer: Erik Andersen <andersee@debian.org> -Build-Depends: debhelper (>= 2.1.18), dpkg-dev (>= 1.7.0) -Build-Depends-Indep: sgmltools-lite, w3m -Standards-Version: 3.2.1.0 - -Package: busybox-cvs-doc -Architecture: all -Section: doc -Description: Documentation for busybox - Documentation in various formats on busybox commands and their options. +Maintainer: Debian Install System Team <debian-boot@lists.debian.org> +Uploaders: Erik Andersen <andersee@debian.org>, Bastian Blank <waldi@debian.org>, Tollef Fog Heen <tfheen@debian.org> +Build-Depends: debhelper (>= 2.1.18) +Standards-Version: 3.5.7.0 Package: busybox-cvs Architecture: any @@ -17,7 +11,7 @@ Depends: ${shlibs:Depends} Conflicts: busybox-cvs-static, busybox, busybox-static Replaces: busybox-cvs-static, busybox, busybox-static Section: utils -Description: Tiny utilities for small and embedded systems. +Description: Tiny utilities for small and embedded systems BusyBox combines tiny versions of many common UNIX utilities into a single small executable. It provides minimalist replacements for the most common utilities you would usually find on your desktop system (i.e., ls, cp, mv, @@ -37,7 +31,7 @@ Depends: ${shlibs:Depends} Conflicts: busybox-cvs, busybox-static, busybox Replaces: busybox-cvs, busybox-static, busybox Section: shells -Description: Standalone rescue shell with tons of builtin utilities. +Description: Standalone rescue shell with tons of builtin utilities BusyBox combines tiny versions of many common UNIX utilities into a single small executable. It provides minimalist replacements for the most common utilities you would usually find on your desktop system (i.e., ls, cp, mv, diff --git a/debian/copyright b/debian/copyright index 9a51d73c7..cf9f3681c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -2,6 +2,23 @@ This package was debianized by Erik Andersen <andersee@debian.org> on Sun, 18 Jun 2000 23:31:02 -0600 It was downloaded from ftp://ftp.busybox.net/busybox -HomePage is at: http://busybox.net/ -Copyright: GPL +Copyright: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + diff --git a/debian/rules b/debian/rules index 076e8edbd..197f98a46 100755 --- a/debian/rules +++ b/debian/rules @@ -26,7 +26,7 @@ build-arch-stamp: $(MAKE) clean cp ./debian/config-static .config $(MAKE) dep - $(MAKE) DOSTATIC=true DODEBUG=$(DODEBUG) + $(MAKE) DODEBUG=$(DODEBUG) install busybox busybox-static $(MAKE) clean @@ -34,23 +34,19 @@ build-arch-stamp: $(MAKE) dep $(MAKE) DODEBUG=$(DODEBUG) - touch build-arch-stamp - -build-indep: build-indep-stamp -build-indep-stamp: - $(MAKE) newdoc + $(MAKE) docs/BusyBox.1 - touch build-indep-stamp + touch build-arch-stamp -build: build-arch build-indep +build: build-arch clean: dh_testdir dh_testroot - rm -f build-arch-stamp build-indep-stamp + rm -f build-arch-stamp build-indep-stamp debian/files~ $(MAKE) distclean - -rm -f busybox-deb busybox-static + -rm -f busybox-deb busybox-static .config busybox.1 dh_clean @@ -63,34 +59,10 @@ install: build-arch install busybox-deb $(CURDIR)/debian/busybox-cvs/bin/busybox install busybox-static $(CURDIR)/debian/busybox-cvs-static/bin/busybox $(MAKE) PREFIX=$(CURDIR)/debian/busybox-cvs-udeb install + cp docs/BusyBox.1 busybox.1 -# Build architecture-independent files here. -# Pass -i to all debhelper commands in this target to reduce clutter. -binary-indep: build - dh_testdir -i - dh_testroot -i -# dh_installdebconf -i - dh_installdocs -i -# dh_installexamples -i -# dh_installmenu -i -# dh_installlogrotate -i -# dh_installemacsen -i -# dh_installpam -i -# dh_installmime -i -# dh_installinit -i -# dh_installcron -i -# dh_installman -i -# dh_installinfo -i -# dh_undocumented -i - dh_installchangelogs Changelog -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_installdeb -i -# dh_perl -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i + install -m644 debian/busybox-cvs-static.override \ + debian/busybox-cvs-static/usr/share/lintian/overrides/busybox-cvs-static # Build architecture-dependent files here. binary-arch: build-arch install @@ -106,7 +78,7 @@ binary-arch: build-arch install # dh_installmime -a # dh_installinit -a # dh_installcron -a -# dh_installman -a + dh_installman -a -Nbusybox-cvs-udeb # dh_installinfo -a # dh_undocumented -a dh_installchangelogs Changelog -a -Nbusybox-cvs-udeb @@ -118,11 +90,13 @@ binary-arch: build-arch install dh_installdeb -a # dh_perl -a dh_shlibdeps -a - dh_gencontrol -a + dh_gencontrol -a -Nbusybox-cvs-udeb dh_md5sums -a -Nbusybox-cvs-udeb dh_builddeb -a -Nbusybox-cvs-udeb - dpkg-distaddfile busybox-cvs-udeb_$(VERSION)_$(ARCH).udeb debian-installer optional + + dh_gencontrol -pbusybox-cvs-udeb -- -fdebian/files~ + dpkg-distaddfile busybox-cvs-udeb_$(VERSION)_$(ARCH).udeb debian-installer standard dh_builddeb -pbusybox-cvs-udeb --filename=busybox-cvs-udeb_$(VERSION)_$(ARCH).udeb -binary: binary-indep binary-arch +binary: binary-arch .PHONY: build clean binary-indep binary-arch binary install |