diff --git a/debian/README.debian b/debian/README.debian deleted file mode 100644 index 443dd6c2b..000000000 --- a/debian/README.debian +++ /dev/null @@ -1,13 +0,0 @@ -BusyBox for Debian ----------------------- - -BusyBox is being developed and maintained by Erik Andersen -. - -If you find any bugs, please submit a detailed bug report to the busybox -mailing list at . A well-written bug report should -include a transcript of a shell session that demonstrates the bad behavior and -enables anyone else to duplicate the bug on their own machine. Bug reports -lacking such detail may never be fixed... - -Erik Andersen , Sun, 18 Jun 2000 21:52:00 -0600 diff --git a/debian/changelog b/debian/changelog index ecd5a47ba..22d3ccb05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,73 @@ +busybox-cvs (20031212-3) unstable; urgency=low + + * debian/config-udeb-linux: + - Enable freeramdisk. (closes: #225360) + + -- Bastian Blank Tue, 30 Dec 2003 22:36:50 +0100 + +busybox-cvs (20031212-2) unstable; urgency=low + + * debian/config-udeb: + - Enable freeramdisk + * archival/libunarchive/data_extract_to_stdout.c: + - Don't extract to much (upstream). + * archival/libunarchive/data_extract_all.c: + - Don't set permissions on symlinks (upstream). + * editors/sed.c: + - Fix (upstream). (closes: #224676) + + -- Bastian Blank Tue, 23 Dec 2003 16:59:13 +0100 + +busybox-cvs (20031212-1) unstable; urgency=low + + * new cvs version + - fixes IOR in fdisk. (closes: #223773) + * debian/config* + - update + - remove mtab support from mount in busybox-static. (closes: #222386) + - enable progress bar for wget. (closes: #223770) + * modutils/obj/obj_s390{,x}.c + - fix abi change, R_390_GOTOFF -> R_390_GOTOFF32. (closes: #216528) + * acknowledge nmu. (closes: #216950, #216756, #215169, #215613) + + -- Bastian Blank Fri, 12 Dec 2003 21:19:41 +0100 + +busybox-cvs (20030926-2.1) unstable; urgency=low + + * NMU + * Remove /sbin/init from the udebs, while still leaving init support + compiled in. rootskel takes over providing init, but then calls bb init. + Remove linuxrc support from the udebs entirely. Closes: #216756 + * config-floppy-udeb-linux: add minimal find, grep. Closes: #215169 + * net-udeb-linux-i386: add loopback mount support. Closes: #215613 + + -- Joey Hess Tue, 21 Oct 2003 12:47:52 -0400 + +busybox-cvs (20030926-2) unstable; urgency=low + + * debian/config-floppy-udeb-linux + - update for new floppy images (closes: #212986, #214102) + + -- Bastian Blank Thu, 09 Oct 2003 12:25:49 +0200 + +busybox-cvs (20030926-1) unstable; urgency=low + + * new cvs version + * Makefile + - fix libpwdgrp link (upstream) (closes: #211675) + * Rules.mak.in + - fix optimization (closes: #212485) + * debian/config* + - update + * debian/config*udeb* + - move linux-i386 to linux (enable modutils on any linux arch) + - rename net to floppy + - enable wget status bar (closes: #211457) + * init/init.c + - workaround race conditions (closes: #212764) + + -- Bastian Blank Fri, 26 Sep 2003 15:10:14 +0200 + busybox-cvs (0.60.99.cvs20030819-3) unstable; urgency=low * shell/ash.c @@ -8,7 +78,7 @@ busybox-cvs (0.60.99.cvs20030819-3) unstable; urgency=low busybox-cvs (0.60.99.cvs20030819-2) unstable; urgency=low * Fix configure permisions - * Set source Section to embedded + * Set source Section to embedded -- Glenn McGrath Mon, 25 Aug 2003 06:33:19 +0000 @@ -406,3 +476,4 @@ busybox (0.45-1) unstable; urgency=low (i.e. when libc gets screwed up.) -- Erik Andersen Tue, 27 Jun 2000 12:26:41 -0600 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/config-deb b/debian/config-deb index 677b18560..9c1034a20 100644 --- a/debian/config-deb +++ b/debian/config-deb @@ -51,12 +51,17 @@ CONFIG_FEATURE_TAR_CREATE=y # CONFIG_FEATURE_TAR_BZIP2 is not set # CONFIG_FEATURE_TAR_EXCLUDE is not set CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set # CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set # CONFIG_UNCOMPRESS is not set # CONFIG_UNZIP is not set +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set + # # Coreutils # @@ -113,8 +118,6 @@ CONFIG_RMDIR=y CONFIG_SLEEP=y # CONFIG_FEATURE_FANCY_SLEEP is not set CONFIG_SORT=y -# CONFIG_FEATURE_SORT_REVERSE is not set -# CONFIG_FEATURE_SORT_UNIQUE is not set # CONFIG_STTY is not set CONFIG_SYNC=y CONFIG_TAIL=y @@ -151,6 +154,11 @@ CONFIG_FEATURE_AUTOWIDTH=y # CONFIG_FEATURE_HUMAN_READABLE=y +# +# Common options for md5sum, sha1sum +# +# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set + # # Console Utilities # @@ -158,6 +166,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y CONFIG_CLEAR=y # CONFIG_DEALLOCVT is not set # CONFIG_DUMPKMAP is not set +# CONFIG_LOADACM is not set # CONFIG_LOADFONT is not set CONFIG_LOADKMAP=y # CONFIG_OPENVT is not set @@ -168,6 +177,7 @@ CONFIG_RESET=y # Debian Utilities # # CONFIG_MKTEMP is not set +# CONFIG_PIPE_PROGRESS is not set # CONFIG_READLINK is not set # CONFIG_RUN_PARTS is not set # CONFIG_START_STOP_DAEMON is not set @@ -179,8 +189,6 @@ CONFIG_WHICH=y # CONFIG_AWK is not set # CONFIG_PATCH is not set CONFIG_SED=y -# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set -CONFIG_FEATURE_SED_GNU_COMPATABILITY=y # CONFIG_VI is not set # @@ -234,6 +242,7 @@ CONFIG_REBOOT=y # CONFIG_CROND is not set # CONFIG_CRONTAB is not set # CONFIG_DC is not set +# CONFIG_DEVFSD is not set # CONFIG_LAST is not set # CONFIG_HDPARM is not set # CONFIG_MAKEDEVS is not set @@ -289,7 +298,7 @@ CONFIG_ROUTE=y CONFIG_WGET=y CONFIG_FEATURE_WGET_STATUSBAR=y CONFIG_FEATURE_WGET_AUTHENTICATION=y -# CONFIG_FEATURE_WGET_IP6_LITERAL is not set +CONFIG_FEATURE_WGET_IP6_LITERAL=y # # udhcp Server/Client @@ -326,6 +335,7 @@ CONFIG_FEATURE_SH_IS_NONE=y # System Logging Utilities # CONFIG_SYSLOGD=y +# CONFIG_FEATURE_ROTATE_LOGFILE is not set # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_KLOGD=y diff --git a/debian/config-floppy-udeb-linux b/debian/config-floppy-udeb-linux new file mode 100644 index 000000000..b5f728cef --- /dev/null +++ b/debian/config-floppy-udeb-linux @@ -0,0 +1,359 @@ +# +# Automatically generated make config: don't edit +# +HAVE_DOT_CONFIG=y + +# +# General Configuration +# +# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set +CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y +# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set +# CONFIG_FEATURE_VERBOSE_USAGE is not set +# CONFIG_FEATURE_INSTALLER is not set +# CONFIG_LOCALE_SUPPORT is not set +CONFIG_FEATURE_DEVFS=y +CONFIG_FEATURE_DEVPTS=y +# CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_SUID is not set +# CONFIG_SELINUX is not set + +# +# Build Options +# +# CONFIG_STATIC is not set +CONFIG_LFS=y +# USING_CROSS_COMPILER is not set +EXTRA_CFLAGS_OPTIONS="" + +# +# Installation Options +# +# CONFIG_INSTALL_NO_USR is not set +PREFIX="./_install" + +# +# Archival Utilities +# +# CONFIG_AR is not set +# CONFIG_BUNZIP2 is not set +# CONFIG_CPIO is not set +# CONFIG_DPKG is not set +# CONFIG_DPKG_DEB is not set +CONFIG_GUNZIP=y +# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set +# CONFIG_GZIP is not set +# CONFIG_RPM2CPIO is not set +# CONFIG_RPM is not set +# CONFIG_TAR is not set +# CONFIG_UNCOMPRESS is not set +# CONFIG_UNZIP is not set + +# +# Coreutils +# +# CONFIG_BASENAME is not set +# CONFIG_CAL is not set +CONFIG_CAT=y +# CONFIG_CHGRP is not set +# CONFIG_CHMOD is not set +# CONFIG_CHOWN is not set +CONFIG_CHROOT=y +# CONFIG_CMP is not set +CONFIG_CP=y +# CONFIG_CUT is not set +# CONFIG_DATE is not set +# CONFIG_DD is not set +# CONFIG_DF is not set +# CONFIG_DIRNAME is not set +# CONFIG_DOS2UNIX is not set +# CONFIG_DU is not set +CONFIG_ECHO=y +CONFIG_FEATURE_FANCY_ECHO=y +# CONFIG_ENV is not set +# CONFIG_EXPR is not set +# CONFIG_FALSE is not set +# CONFIG_FOLD is not set +# CONFIG_HEAD is not set +# CONFIG_HOSTID is not set +# CONFIG_ID is not set +# CONFIG_INSTALL is not set +# CONFIG_LENGTH is not set +CONFIG_LN=y +# CONFIG_LOGNAME is not set +# CONFIG_LS is not set +# CONFIG_MD5SUM is not set +# CONFIG_MKDIR is not set +# CONFIG_MKFIFO is not set +# CONFIG_MKNOD is not set +# CONFIG_MV is not set +# CONFIG_OD is not set +# CONFIG_PRINTF is not set +# CONFIG_PWD is not set +# CONFIG_REALPATH is not set +CONFIG_RM=y +# CONFIG_RMDIR is not set +# CONFIG_SHA1SUM is not set +CONFIG_SLEEP=y +# CONFIG_FEATURE_FANCY_SLEEP is not set +# CONFIG_SORT is not set +# CONFIG_STTY is not set +# CONFIG_SYNC is not set +# CONFIG_TAIL is not set +# CONFIG_TEE is not set +CONFIG_TEST=y + +# +# test (forced enabled for use with shell) +# +# CONFIG_TOUCH is not set +# CONFIG_TR is not set +# CONFIG_TRUE is not set +# CONFIG_TTY is not set +# CONFIG_UNAME is not set +# CONFIG_UNIQ is not set +# CONFIG_USLEEP is not set +# CONFIG_UUDECODE is not set +# CONFIG_UUENCODE is not set +# CONFIG_WATCH is not set +# CONFIG_WC is not set +# CONFIG_WHO is not set +# CONFIG_WHOAMI is not set +# CONFIG_YES is not set + +# +# Common options for cp and mv +# +CONFIG_FEATURE_PRESERVE_HARDLINKS=y + +# +# Console Utilities +# +# CONFIG_CHVT is not set +# CONFIG_CLEAR is not set +# CONFIG_DEALLOCVT is not set +# CONFIG_DUMPKMAP is not set +# CONFIG_LOADACM is not set +# CONFIG_LOADFONT is not set +# CONFIG_LOADKMAP is not set +# CONFIG_OPENVT is not set +# CONFIG_RESET is not set +# CONFIG_SETKEYCODES is not set + +# +# Debian Utilities +# +# CONFIG_MKTEMP is not set +# CONFIG_PIPE_PROGRESS is not set +# CONFIG_READLINK is not set +# CONFIG_RUN_PARTS is not set +# CONFIG_START_STOP_DAEMON is not set +# CONFIG_WHICH is not set + +# +# Editors +# +# CONFIG_AWK is not set +# CONFIG_PATCH is not set +# CONFIG_SED is not set +# CONFIG_VI is not set + +# +# Finding Utilities +# +CONFIG_FIND=y +# CONFIG_FEATURE_FIND_MTIME is not set +# CONFIG_FEATURE_FIND_PERM is not set +# CONFIG_FEATURE_FIND_TYPE is not set +# CONFIG_FEATURE_FIND_XDEV is not set +# CONFIG_FEATURE_FIND_NEWER is not set +# CONFIG_FEATURE_FIND_INUM is not set +CONFIG_GREP=y +# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set +# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set +# CONFIG_FEATURE_GREP_CONTEXT is not set +# CONFIG_XARGS is not set + +# +# Init Utilities +# +# CONFIG_INIT is not set +# CONFIG_HALT is not set +# CONFIG_POWEROFF is not set +# CONFIG_REBOOT is not set +# CONFIG_MINIT is not set +# CONFIG_MESG is not set + +# +# Login/Password Management Utilities +# +CONFIG_USE_BB_PWD_GRP=y +# CONFIG_ADDGROUP is not set +# CONFIG_DELGROUP is not set +# CONFIG_ADDUSER is not set +# CONFIG_DELUSER is not set +# CONFIG_GETTY is not set +# CONFIG_LOGIN is not set +# CONFIG_PASSWD is not set +# CONFIG_SU is not set +# CONFIG_SULOGIN is not set +# CONFIG_VLOCK is not set + +# +# Miscellaneous Utilities +# +# CONFIG_ADJTIMEX is not set +# CONFIG_CROND is not set +# CONFIG_CRONTAB is not set +# CONFIG_DC is not set +# CONFIG_DEVFSD is not set +# CONFIG_LAST is not set +# CONFIG_HDPARM is not set +# CONFIG_MAKEDEVS is not set +# CONFIG_MT is not set +# CONFIG_STRINGS is not set +# CONFIG_TIME is not set +# CONFIG_WATCHDOG is not set + +# +# Linux Module Utilities +# +CONFIG_MODUTILS_OBJ=y +# CONFIG_DEPMOD is not set +CONFIG_INSMOD=y +# CONFIG_FEATURE_2_2_MODULES is not set +CONFIG_FEATURE_2_4_MODULES=y +# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set +# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set +# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set +# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set +# CONFIG_LSMOD is not set +CONFIG_MODPROBE=y +# CONFIG_RMMOD is not set +CONFIG_FEATURE_CHECK_TAINTED_MODULE=y + +# +# Networking Utilities +# +# CONFIG_FEATURE_IPV6 is not set +# CONFIG_ARPING is not set +# CONFIG_FTPGET is not set +# CONFIG_FTPPUT is not set +# CONFIG_HOSTNAME is not set +# CONFIG_HTTPD is not set +# CONFIG_IFCONFIG is not set +# CONFIG_IFUPDOWN is not set +# CONFIG_INETD 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_NAMEIF is not set +# CONFIG_NC is not set +# CONFIG_NETSTAT is not set +# CONFIG_NSLOOKUP is not set +# CONFIG_PING is not set +# CONFIG_ROUTE is not set +# CONFIG_TELNET is not set +# CONFIG_TELNETD is not set +# CONFIG_TFTP is not set +# CONFIG_TRACEROUTE is not set +# CONFIG_VCONFIG is not set +# CONFIG_WGET is not set + +# +# udhcp Server/Client +# +# CONFIG_UDHCPD is not set +# CONFIG_UDHCPC is not set + +# +# Process Utilities +# +# CONFIG_FREE is not set +# CONFIG_KILL is not set +# CONFIG_PIDOF is not set +# CONFIG_PS is not set +# CONFIG_RENICE is not set +# CONFIG_TOP is not set +# CONFIG_UPTIME is not set + +# +# Another Bourne-like Shell +# +CONFIG_FEATURE_SH_IS_ASH=y +# CONFIG_FEATURE_SH_IS_HUSH is not set +# CONFIG_FEATURE_SH_IS_LASH is not set +# CONFIG_FEATURE_SH_IS_MSH is not set +# CONFIG_FEATURE_SH_IS_NONE is not set +CONFIG_ASH=y + +# +# Ash Shell Options +# +# CONFIG_ASH_JOB_CONTROL is not set +# CONFIG_ASH_ALIAS is not set +# CONFIG_ASH_MATH_SUPPORT is not set +# CONFIG_ASH_GETOPTS is not set +# CONFIG_ASH_CMDCMD is not set +# CONFIG_ASH_MAIL is not set +CONFIG_ASH_OPTIMIZE_FOR_SIZE=y +# CONFIG_HUSH is not set +# CONFIG_LASH is not set +# CONFIG_MSH is not set + +# +# Bourne Shell Options +# +# CONFIG_FEATURE_COMMAND_EDITING is not set +# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set +# CONFIG_FEATURE_COMMAND_TAB_COMPLETION is not set +# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set +CONFIG_FEATURE_COMMAND_HISTORY=15 +# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set +# CONFIG_FEATURE_SH_FANCY_PROMPT is not set +# CONFIG_FEATURE_SH_EXTRA_QUIET is not set + +# +# System Logging Utilities +# +# CONFIG_SYSLOGD is not set +# CONFIG_LOGGER is not set + +# +# Linux System Utilities +# +# CONFIG_DMESG is not set +# CONFIG_FBSET is not set +# CONFIG_FDFLUSH is not set +# CONFIG_FDFORMAT is not set +# CONFIG_FDISK is not set +# CONFIG_FREERAMDISK is not set +# CONFIG_FSCK_MINIX is not set +# CONFIG_MKFS_MINIX is not set +# CONFIG_GETOPT is not set +# CONFIG_HEXDUMP is not set +# CONFIG_HWCLOCK is not set +# CONFIG_LOSETUP is not set +# CONFIG_MKSWAP is not set +# CONFIG_MORE is not set +CONFIG_PIVOT_ROOT=y +# CONFIG_RDATE is not set +# CONFIG_SWAPONOFF is not set +CONFIG_MOUNT=y +# CONFIG_NFSMOUNT 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 +# +# CONFIG_DEBUG is not set diff --git a/debian/config-static b/debian/config-static index 3ca24b173..5114da6b1 100644 --- a/debian/config-static +++ b/debian/config-static @@ -54,12 +54,17 @@ CONFIG_FEATURE_TAR_CREATE=y CONFIG_FEATURE_TAR_BZIP2=y CONFIG_FEATURE_TAR_EXCLUDE=y CONFIG_FEATURE_TAR_GZIP=y -# CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set +# CONFIG_FEATURE_TAR_COMPRESS is not set +CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_UNARCHIVE_TAPE=y CONFIG_UNCOMPRESS=y CONFIG_UNZIP=y +# +# Common options for cpio and tar +# +CONFIG_FEATURE_UNARCHIVE_TAPE=y + # # Coreutils # @@ -91,9 +96,9 @@ CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y CONFIG_EXPR=y CONFIG_FALSE=y -# CONFIG_FOLD is not set +CONFIG_FOLD=y CONFIG_HEAD=y -# CONFIG_FEATURE_FANCY_HEAD is not set +CONFIG_FEATURE_FANCY_HEAD=y CONFIG_HOSTID=y CONFIG_ID=y # CONFIG_INSTALL is not set @@ -116,21 +121,19 @@ CONFIG_MV=y CONFIG_OD=y CONFIG_PRINTF=y CONFIG_PWD=y -# CONFIG_REALPATH is not set +CONFIG_REALPATH=y CONFIG_RM=y CONFIG_RMDIR=y -# CONFIG_SHA1SUM is not set +CONFIG_SHA1SUM=y CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set +CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_SORT=y -CONFIG_FEATURE_SORT_REVERSE=y -CONFIG_FEATURE_SORT_UNIQUE=y CONFIG_STTY=y CONFIG_SYNC=y CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y CONFIG_TEE=y -# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set +CONFIG_FEATURE_TEE_USE_BLOCK_IO=y CONFIG_TEST=y # @@ -166,6 +169,11 @@ CONFIG_FEATURE_AUTOWIDTH=y # CONFIG_FEATURE_HUMAN_READABLE=y +# +# Common options for md5sum, sha1sum +# +# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set + # # Console Utilities # @@ -173,6 +181,7 @@ CONFIG_CHVT=y CONFIG_CLEAR=y CONFIG_DEALLOCVT=y CONFIG_DUMPKMAP=y +CONFIG_LOADACM=y CONFIG_LOADFONT=y CONFIG_LOADKMAP=y CONFIG_OPENVT=y @@ -183,6 +192,7 @@ CONFIG_SETKEYCODES=y # Debian Utilities # CONFIG_MKTEMP=y +# CONFIG_PIPE_PROGRESS is not set CONFIG_READLINK=y CONFIG_RUN_PARTS=y CONFIG_START_STOP_DAEMON=y @@ -195,8 +205,6 @@ CONFIG_AWK=y CONFIG_FEATURE_AWK_MATH=y CONFIG_PATCH=y CONFIG_SED=y -# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set -CONFIG_FEATURE_SED_GNU_COMPATABILITY=y CONFIG_VI=y CONFIG_FEATURE_VI_COLON=y CONFIG_FEATURE_VI_YANKMARK=y @@ -224,6 +232,10 @@ CONFIG_FEATURE_GREP_EGREP_ALIAS=y CONFIG_FEATURE_GREP_FGREP_ALIAS=y CONFIG_FEATURE_GREP_CONTEXT=y CONFIG_XARGS=y +# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set +# CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set +# CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set +# CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set # # Init Utilities @@ -268,6 +280,7 @@ CONFIG_CROND=y CONFIG_FEATURE_CROND_CALL_SENDMAIL=y CONFIG_CRONTAB=y CONFIG_DC=y +# CONFIG_DEVFSD is not set CONFIG_LAST=y # CONFIG_HDPARM is not set CONFIG_MAKEDEVS=y @@ -432,6 +445,7 @@ CONFIG_FEATURE_SH_FANCY_PROMPT=y # System Logging Utilities # CONFIG_SYSLOGD=y +# CONFIG_FEATURE_ROTATE_LOGFILE is not set CONFIG_FEATURE_REMOTE_LOG=y CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_LOGREAD=y @@ -482,8 +496,7 @@ CONFIG_FEATURE_MOUNT_FORCE=y # Common options for mount/umount # CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MTAB_SUPPORT=y -CONFIG_FEATURE_MTAB_FILENAME="/etc/mtab" +# CONFIG_FEATURE_MTAB_SUPPORT is not set # # Debugging Options diff --git a/debian/config-udeb b/debian/config-udeb index cca6ff9e8..3cb612f7e 100644 --- a/debian/config-udeb +++ b/debian/config-udeb @@ -51,12 +51,17 @@ CONFIG_TAR=y # CONFIG_FEATURE_TAR_BZIP2 is not set # CONFIG_FEATURE_TAR_EXCLUDE is not set CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set # CONFIG_UNCOMPRESS is not set # CONFIG_UNZIP is not set +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set + # # Coreutils # @@ -112,8 +117,6 @@ CONFIG_RMDIR=y # CONFIG_SHA1SUM is not set # CONFIG_SLEEP is not set CONFIG_SORT=y -# CONFIG_FEATURE_SORT_REVERSE is not set -# CONFIG_FEATURE_SORT_UNIQUE is not set # CONFIG_STTY is not set CONFIG_SYNC=y CONFIG_TAIL=y @@ -154,6 +157,11 @@ CONFIG_FEATURE_AUTOWIDTH=y # CONFIG_FEATURE_HUMAN_READABLE=y +# +# Common options for md5sum, sha1sum +# +# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set + # # Console Utilities # @@ -161,6 +169,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y # CONFIG_CLEAR is not set # CONFIG_DEALLOCVT is not set # CONFIG_DUMPKMAP is not set +# CONFIG_LOADACM is not set # CONFIG_LOADFONT is not set # CONFIG_LOADKMAP is not set # CONFIG_OPENVT is not set @@ -171,6 +180,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y # Debian Utilities # # CONFIG_MKTEMP is not set +# CONFIG_PIPE_PROGRESS is not set CONFIG_READLINK=y # CONFIG_RUN_PARTS is not set # CONFIG_START_STOP_DAEMON is not set @@ -182,8 +192,6 @@ CONFIG_READLINK=y # CONFIG_AWK is not set # CONFIG_PATCH is not set CONFIG_SED=y -# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set -CONFIG_FEATURE_SED_GNU_COMPATABILITY=y # CONFIG_VI is not set # @@ -207,9 +215,9 @@ CONFIG_GREP=y # CONFIG_INIT=y CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_INITRD=y +# CONFIG_FEATURE_INITRD is not set # CONFIG_FEATURE_INIT_COREDUMPS is not set -# CONFIG_FEATURE_EXTRA_QUIET is not set +CONFIG_FEATURE_EXTRA_QUIET=y CONFIG_HALT=y # CONFIG_POWEROFF is not set CONFIG_REBOOT=y @@ -237,6 +245,7 @@ CONFIG_USE_BB_PWD_GRP=y # CONFIG_CROND is not set # CONFIG_CRONTAB is not set # CONFIG_DC is not set +# CONFIG_DEVFSD is not set # CONFIG_LAST is not set # CONFIG_HDPARM is not set # CONFIG_MAKEDEVS is not set @@ -293,9 +302,9 @@ CONFIG_ROUTE=y # CONFIG_TRACEROUTE is not set # CONFIG_VCONFIG is not set CONFIG_WGET=y -# CONFIG_FEATURE_WGET_STATUSBAR is not set +CONFIG_FEATURE_WGET_STATUSBAR=y CONFIG_FEATURE_WGET_AUTHENTICATION=y -# CONFIG_FEATURE_WGET_IP6_LITERAL is not set +CONFIG_FEATURE_WGET_IP6_LITERAL=y # # udhcp Server/Client @@ -358,6 +367,7 @@ CONFIG_FEATURE_SH_FANCY_PROMPT=y # System Logging Utilities # CONFIG_SYSLOGD=y +# CONFIG_FEATURE_ROTATE_LOGFILE is not set # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_KLOGD=y @@ -371,7 +381,7 @@ CONFIG_DMESG=y # CONFIG_FDFLUSH is not set # CONFIG_FDFORMAT is not set # CONFIG_FDISK is not set -# CONFIG_FREERAMDISK is not set +CONFIG_FREERAMDISK=y # CONFIG_FSCK_MINIX is not set # CONFIG_MKFS_MINIX is not set # CONFIG_GETOPT is not set @@ -392,7 +402,7 @@ CONFIG_FEATURE_MOUNT_FORCE=y # # Common options for mount/umount # -# CONFIG_FEATURE_MOUNT_LOOP is not set +CONFIG_FEATURE_MOUNT_LOOP=y # CONFIG_FEATURE_MTAB_SUPPORT is not set # diff --git a/debian/config-udeb-linux-i386 b/debian/config-udeb-linux similarity index 94% rename from debian/config-udeb-linux-i386 rename to debian/config-udeb-linux index 90548ef9d..be4e9fb48 100644 --- a/debian/config-udeb-linux-i386 +++ b/debian/config-udeb-linux @@ -51,12 +51,17 @@ CONFIG_TAR=y # CONFIG_FEATURE_TAR_BZIP2 is not set # CONFIG_FEATURE_TAR_EXCLUDE is not set CONFIG_FEATURE_TAR_GZIP=y +# CONFIG_FEATURE_TAR_COMPRESS is not set CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY=y CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set # CONFIG_UNCOMPRESS is not set # CONFIG_UNZIP is not set +# +# Common options for cpio and tar +# +# CONFIG_FEATURE_UNARCHIVE_TAPE is not set + # # Coreutils # @@ -112,8 +117,6 @@ CONFIG_RMDIR=y # CONFIG_SHA1SUM is not set # CONFIG_SLEEP is not set CONFIG_SORT=y -# CONFIG_FEATURE_SORT_REVERSE is not set -# CONFIG_FEATURE_SORT_UNIQUE is not set # CONFIG_STTY is not set CONFIG_SYNC=y CONFIG_TAIL=y @@ -154,6 +157,11 @@ CONFIG_FEATURE_AUTOWIDTH=y # CONFIG_FEATURE_HUMAN_READABLE=y +# +# Common options for md5sum, sha1sum +# +# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set + # # Console Utilities # @@ -161,6 +169,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y # CONFIG_CLEAR is not set # CONFIG_DEALLOCVT is not set # CONFIG_DUMPKMAP is not set +# CONFIG_LOADACM is not set # CONFIG_LOADFONT is not set # CONFIG_LOADKMAP is not set # CONFIG_OPENVT is not set @@ -171,6 +180,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y # Debian Utilities # # CONFIG_MKTEMP is not set +# CONFIG_PIPE_PROGRESS is not set CONFIG_READLINK=y # CONFIG_RUN_PARTS is not set # CONFIG_START_STOP_DAEMON is not set @@ -182,8 +192,6 @@ CONFIG_READLINK=y # CONFIG_AWK is not set # CONFIG_PATCH is not set CONFIG_SED=y -# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set -CONFIG_FEATURE_SED_GNU_COMPATABILITY=y # CONFIG_VI is not set # @@ -198,7 +206,7 @@ CONFIG_FEATURE_FIND_NEWER=y CONFIG_FEATURE_FIND_INUM=y CONFIG_GREP=y # CONFIG_FEATURE_GREP_EGREP_ALIAS is not set -CONFIG_FEATURE_GREP_FGREP_ALIAS=y +# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set # CONFIG_FEATURE_GREP_CONTEXT is not set # CONFIG_XARGS is not set @@ -207,7 +215,7 @@ CONFIG_FEATURE_GREP_FGREP_ALIAS=y # CONFIG_INIT=y CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_INITRD=y +# CONFIG_FEATURE_INITRD is not set # CONFIG_FEATURE_INIT_COREDUMPS is not set CONFIG_FEATURE_EXTRA_QUIET=y CONFIG_HALT=y @@ -237,6 +245,7 @@ CONFIG_USE_BB_PWD_GRP=y # CONFIG_CROND is not set # CONFIG_CRONTAB is not set # CONFIG_DC is not set +# CONFIG_DEVFSD is not set # CONFIG_LAST is not set # CONFIG_HDPARM is not set # CONFIG_MAKEDEVS is not set @@ -253,10 +262,6 @@ CONFIG_DEPMOD=y CONFIG_INSMOD=y # CONFIG_FEATURE_2_2_MODULES is not set CONFIG_FEATURE_2_4_MODULES=y - -# -# Support new (post 2.1) Linux kernels (Forced enabled) -# # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set @@ -306,9 +311,9 @@ CONFIG_ROUTE=y # CONFIG_TRACEROUTE is not set # CONFIG_VCONFIG is not set CONFIG_WGET=y -# CONFIG_FEATURE_WGET_STATUSBAR is not set +CONFIG_FEATURE_WGET_STATUSBAR=y CONFIG_FEATURE_WGET_AUTHENTICATION=y -# CONFIG_FEATURE_WGET_IP6_LITERAL is not set +CONFIG_FEATURE_WGET_IP6_LITERAL=y # # udhcp Server/Client @@ -371,6 +376,7 @@ CONFIG_FEATURE_SH_FANCY_PROMPT=y # System Logging Utilities # CONFIG_SYSLOGD=y +# CONFIG_FEATURE_ROTATE_LOGFILE is not set # CONFIG_FEATURE_REMOTE_LOG is not set # CONFIG_FEATURE_IPC_SYSLOG is not set CONFIG_KLOGD=y @@ -384,7 +390,7 @@ CONFIG_DMESG=y # CONFIG_FDFLUSH is not set # CONFIG_FDFORMAT is not set # CONFIG_FDISK is not set -# CONFIG_FREERAMDISK is not set +CONFIG_FREERAMDISK=y # CONFIG_FSCK_MINIX is not set # CONFIG_MKFS_MINIX is not set # CONFIG_GETOPT is not set @@ -405,7 +411,7 @@ CONFIG_FEATURE_MOUNT_FORCE=y # # Common options for mount/umount # -# CONFIG_FEATURE_MOUNT_LOOP is not set +CONFIG_FEATURE_MOUNT_LOOP=y # CONFIG_FEATURE_MTAB_SUPPORT is not set # diff --git a/debian/control b/debian/control index d45758c23..232408048 100644 --- a/debian/control +++ b/debian/control @@ -52,7 +52,7 @@ Architecture: any Depends: ${shlibs:Depends} Section: debian-installer Conflicts: busybox-udeb -Enhances: busybox-cvs-net-udeb +Enhances: busybox-cvs-floppy-udeb Priority: extra Description: Tiny utilities for the debian-installer BusyBox combines tiny versions of many common UNIX utilities into a single @@ -67,13 +67,13 @@ Description: Tiny utilities for the debian-installer on the debian-installer, this package is not for you. Installing this on your Debian system is a very, very bad idea. You have been warned. -Package: busybox-cvs-net-udeb +Package: busybox-cvs-floppy-udeb Architecture: i386 Depends: ${shlibs:Depends} Section: debian-installer Conflicts: busybox-udeb Priority: extra -Description: Tiny utilities for the debian-installer network images +Description: Tiny utilities for the debian-installer floppy images 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/control-extract b/debian/control-extract new file mode 100644 index 000000000..ed65f2986 --- /dev/null +++ b/debian/control-extract @@ -0,0 +1,2 @@ +#!/bin/sh +awk "BEGIN { i = 0; } { if (/^Package: $2/) i = 1; if (/^\s*\$/) i = 0; if (/$1:/ && i) print }" < debian/control | sed -e "s,^$1: ,," diff --git a/debian/copyright b/debian/copyright index 0f2694ad7..cf9f3681c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -This package was debianized by Erik Andersen on +This package was debianized by Erik Andersen on Sun, 18 Jun 2000 23:31:02 -0600 It was downloaded from ftp://ftp.busybox.net/busybox diff --git a/debian/rules b/debian/rules index 82bf9f04a..e77b4ef96 100755 --- a/debian/rules +++ b/debian/rules @@ -3,10 +3,9 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatibility version to use. -export DH_COMPAT=3 - DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) +DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) VERSION = $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2) @@ -18,25 +17,39 @@ endif PACKAGE_PREFIX = busybox-cvs +ARCH_FLOPPY_UDEB = $(shell sh debian/control-extract Architecture $(PACKAGE_PREFIX)-floppy-udeb) + PACKAGES_DEB = $(PACKAGE_PREFIX) $(PACKAGE_PREFIX)-static PACKAGES_UDEB = $(PACKAGE_PREFIX)-udeb -ifneq ($(wildcard ./debian/config-net-udeb-$(DEB_HOST_ARCH)),) -PACKAGES_UDEB += $(PACKAGE_PREFIX)-net-udeb +ifneq ($(filter $(DEB_HOST_ARCH),$(ARCH_FLOPPY_UDEB)),) +PACKAGES_UDEB += $(PACKAGE_PREFIX)-floppy-udeb endif PACKAGES = $(PACKAGES_DEB) $(PACKAGES_UDEB) -DEBHELPER_PACKAGES_DEB = $(patsubst %,-p%,$(PACKAGES_DEB)) -build-arch: build-arch-deb build-arch-static build-arch-udeb build-arch-net-udeb build-arch-doc +DEBHELPER_PACKAGES_DEB = $(patsubst %,-p%,$(PACKAGES_DEB)) +DEBHELPER_PACKAGES_UDEB = $(patsubst %,-p%,$(PACKAGES_UDEB)) + +CONFIG = $(firstword $(wildcard ./debian/config-$(1)-$(DEB_HOST_GNU_SYSTEM)-$(DEB_HOST_GNU_CPU) ./debian/config-$(1)-$(DEB_HOST_GNU_SYSTEM) ./debian/config-$(1))) +CONFIG_DEB = $(call CONFIG,deb) +CONFIG_STATIC = $(call CONFIG,static) +CONFIG_UDEB = $(call CONFIG,udeb) +CONFIG_FLOPPY_UDEB = $(call CONFIG,floppy-udeb) + +configure: configure-stamp +configure-stamp: + sh ./configure + + touch $@ + +build-arch: build-arch-deb-all build-arch-udeb-all +build-arch-deb-all: build-arch-deb build-arch-static build-arch-doc +build-arch-udeb-all: build-arch-udeb build-arch-floppy-udeb build-arch-deb: build-arch-deb-stamp -build-arch-deb-stamp: +build-arch-deb-stamp: configure-stamp $(MAKE) clean -ifeq ($(wildcard ./debian/config-deb-$(DEB_HOST_ARCH)),) - cp ./debian/config-deb .config -else - cp ./debian/config-deb-$(DEB_HOST_ARCH) .config -endif + cp $(CONFIG_DEB) .config $(MAKE) dep $(MAKE) CONFIG_DEBUG=$(CONFIG_DEBUG) @@ -47,14 +60,10 @@ endif touch $@ build-arch-static: build-arch-static-stamp -build-arch-static-stamp: +build-arch-static-stamp: configure-stamp $(MAKE) clean -ifeq ($(wildcard ./debian/config-static-$(DEB_HOST_ARCH)),) - cp ./debian/config-static .config -else - cp ./debian/config-static-$(DEB_HOST_ARCH) .config -endif + cp $(CONFIG_STATIC) .config $(MAKE) dep $(MAKE) CONFIG_DEBUG=$(CONFIG_DEBUG) @@ -65,39 +74,38 @@ endif touch $@ build-arch-udeb: build-arch-udeb-stamp -build-arch-udeb-stamp: +build-arch-udeb-stamp: configure-stamp $(MAKE) clean -ifeq ($(wildcard ./debian/config-udeb-$(DEB_HOST_ARCH)),) - cp ./debian/config-udeb .config -else - cp ./debian/config-udeb-$(DEB_HOST_ARCH) .config -endif + cp $(CONFIG_UDEB) .config $(MAKE) dep $(MAKE) CONFIG_DEBUG=$(CONFIG_DEBUG) $(MAKE) PREFIX=$(CURDIR)/install-$(PACKAGE_PREFIX)-udeb install + # Remove init link, but init support is still compiled in to be + # used. + rm -f $(CURDIR)/install-$(PACKAGE_PREFIX)-udeb/sbin/init touch $@ -build-arch-net-udeb: build-arch-net-udeb-stamp -build-arch-net-udeb-stamp: -ifneq ($(wildcard ./debian/config-net-udeb-$(DEB_HOST_ARCH)),) +build-arch-floppy-udeb: build-arch-floppy-udeb-stamp +build-arch-floppy-udeb-stamp: configure-stamp +ifneq ($(filter $(DEB_HOST_ARCH),$(ARCH_FLOPPY_UDEB)),) $(MAKE) clean - cp ./debian/config-net-udeb-$(DEB_HOST_ARCH) .config + cp $(CONFIG_FLOPPY_UDEB) .config $(MAKE) dep $(MAKE) CONFIG_DEBUG=$(CONFIG_DEBUG) - $(MAKE) PREFIX=$(CURDIR)/install-$(PACKAGE_PREFIX)-net-udeb install + $(MAKE) PREFIX=$(CURDIR)/install-$(PACKAGE_PREFIX)-floppy-udeb install endif touch $@ build-arch-doc: build-arch-doc-stamp -build-arch-doc-stamp: +build-arch-doc-stamp: configure-stamp $(MAKE) docs/BusyBox.1 cp docs/BusyBox.1 busybox.1 @@ -109,20 +117,20 @@ build: build-arch clean: dh_testdir dh_testroot - rm -f build-*-stamp debian/files~ + rm -f build-*-stamp configure-stamp debian/files~ - $(MAKE) distclean + -$(MAKE) distclean -rm -rf busybox-deb busybox-static install* busybox.1 dh_clean -install: build-arch +install-deb: build-arch-deb-all dh_testdir dh_testroot - dh_clean -k - dh_installdirs + dh_clean -k $(DEBHELPER_PACKAGES_DEB) + dh_installdirs $(DEBHELPER_PACKAGES_DEB) - for i in $(PACKAGES); do \ + for i in $(PACKAGES_DEB); do \ ( \ cd install-$$i; \ find -type d -exec install -d $(CURDIR)/debian/$$i/{} \;; \ @@ -133,36 +141,51 @@ install: build-arch install -m644 debian/$(PACKAGE_PREFIX)-static.override \ debian/$(PACKAGE_PREFIX)-static/usr/share/lintian/overrides/$(PACKAGE_PREFIX)-static +install-udeb: build-arch-udeb-all + dh_testdir + dh_testroot + dh_clean -k $(DEBHELPER_PACKAGES_UDEB) + dh_installdirs $(DEBHELPER_PACKAGES_UDEB) + + for i in $(PACKAGES_UDEB); do \ + ( \ + cd install-$$i; \ + find -type d -exec install -d $(CURDIR)/debian/$$i/{} \;; \ + find \( -type f -o -type l \) -exec cp -a {} $(CURDIR)/debian/$$i/{} \;; \ + ); \ + done + +binary-arch: binary-arch-deb binary-arch-udeb + # Build architecture-dependent files here. -binary-arch: build-arch install - dh_testdir -a - dh_testroot -a -# dh_installdebconf -a +binary-arch-deb: build-arch-deb-all install-deb + dh_testdir + dh_testroot dh_installdocs $(DEBHELPER_PACKAGES_DEB) -# dh_installexamples -a -# dh_installmenu -a -# dh_installlogrotate -a -# dh_installemacsen -a -# dh_installpam -a -# dh_installmime -a -# dh_installinit -a -# dh_installcron -a dh_installman $(DEBHELPER_PACKAGES_DEB) -# dh_installinfo -a -# dh_undocumented -a dh_installchangelogs Changelog $(DEBHELPER_PACKAGES_DEB) - dh_strip -a - dh_link -a - dh_compress -a - dh_fixperms -a -# dh_makeshlibs -a - dh_installdeb -a -# dh_perl -a - dh_shlibdeps -a + dh_strip $(DEBHELPER_PACKAGES_DEB) + dh_link $(DEBHELPER_PACKAGES_DEB) + dh_compress $(DEBHELPER_PACKAGES_DEB) + dh_fixperms $(DEBHELPER_PACKAGES_DEB) + dh_installdeb $(DEBHELPER_PACKAGES_DEB) + dh_shlibdeps $(DEBHELPER_PACKAGES_DEB) dh_gencontrol $(DEBHELPER_PACKAGES_DEB) dh_md5sums $(DEBHELPER_PACKAGES_DEB) dh_builddeb $(DEBHELPER_PACKAGES_DEB) +# Build architecture-dependent files here. +binary-arch-udeb: build-arch-udeb-all install-udeb + dh_testdir + dh_testroot + dh_strip $(DEBHELPER_PACKAGES_UDEB) + dh_link $(DEBHELPER_PACKAGES_UDEB) + dh_compress $(DEBHELPER_PACKAGES_UDEB) + dh_fixperms $(DEBHELPER_PACKAGES_UDEB) + dh_installdeb $(DEBHELPER_PACKAGES_UDEB) + dh_shlibdeps $(DEBHELPER_PACKAGES_UDEB) + dh_gencontrol $(DEBHELPER_PACKAGES_DEB) + $(foreach PACKAGE, $(PACKAGES_UDEB), \ dh_gencontrol -p$(PACKAGE) -- -fdebian/files~; \ dpkg-distaddfile $(PACKAGE)_$(VERSION)_$(DEB_HOST_ARCH).udeb debian-installer extra; \