From b79db92a21aee4c003f49eb21f1447b79e0e0c1e Mon Sep 17 00:00:00 2001 From: Glenn L McGrath Date: Tue, 26 Aug 2003 04:50:23 +0000 Subject: Syncronise some build files with busybox-cvs-20030819 --- debian/changelog | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++- debian/config-deb | 17 +++++--- debian/config-static | 40 +++++++++--------- debian/config-udeb | 25 +++++------ debian/control | 5 ++- 5 files changed, 159 insertions(+), 45 deletions(-) diff --git a/debian/changelog b/debian/changelog index 992269a..bc918a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,122 @@ -busybox-cvs (0.60.99.cvs20030420-2) unstable; urgency=low +busybox-cvs (0.60.99.cvs20030819-2) unstable; urgency=low + + * Fix configure permisions + * Set source Section to embedded + + -- Glenn McGrath Mon, 25 Aug 2003 06:33:19 +0000 + +busybox-cvs (0.60.99.cvs20030819-1) unstable; urgency=low + + * new cvs version + + -- Bastian Blank Tue, 19 Aug 2003 13:18:54 +0200 + +busybox-cvs (0.60.99.cvs20030426-10) unstable; urgency=low + + * archival/libunarchive/* + - add hardlink support (pending) + * debian/config-*udeb* + - add support for oldgnu tar format + + -- Bastian Blank Tue, 10 Jun 2003 12:06:41 +0200 + +busybox-cvs (0.60.99.cvs20030426-9) unstable; urgency=low + + * modutils/depmod.c + - fix base_dir for modules.dep + + -- Bastian Blank Sat, 07 Jun 2003 14:52:54 +0200 +busybox-cvs (0.60.99.cvs20030426-8) unstable; urgency=low + + * util-linux/fdisk.c + - fix syscalls. (pending) + * libpwd/* + - don't build setgroups.o + + -- Bastian Blank Tue, 03 Jun 2003 11:26:28 +0200 + +busybox-cvs (0.60.99.cvs20030426-7) unstable; urgency=low + + * libbb/*syscallc.c + - fix syscalls. (upstream) (closes: #194631) + * modutils/* + - update complete objects code from upstream. (pending) + * debian/config-*udeb* + - update to busybox-applets.txt:1.14 + + -- Bastian Blank Thu, 29 May 2003 16:17:14 +0200 + +busybox-cvs (0.60.99.cvs20030426-6) unstable; urgency=low + + * modutils/Makefile.in + - don't build anything if deactivated + + -- Bastian Blank Sat, 24 May 2003 18:57:14 +0200 + +busybox-cvs (0.60.99.cvs20030426-5) unstable; urgency=low + + * debian/config-*udeb* + - revert changes (closes: #192717, #192753) + - readd initrd support (workaround) + - make init quiet * archival/tar.c + - fix usage of tar -O (upstream) (closes: #193788) + + -- Bastian Blank Sat, 24 May 2003 13:25:36 +0200 + +busybox-cvs (0.60.99.cvs20030426-4) unstable; urgency=low + + * debian/config-*udeb* + - update to busybox-applets.txt:1.12 + * debian/rules + - use system instead of arch to determine which config file to use + + -- Bastian Blank Fri, 09 May 2003 11:21:13 +0200 + +busybox-cvs (0.60.99.cvs20030426-3) unstable; urgency=low + + * debian/config-udeb* + - update to busybox-applets.txt:1.11 + + -- Bastian Blank Wed, 07 May 2003 10:37:40 +0200 + +busybox-cvs (0.60.99.cvs20030426-2) unstable; urgency=low + + * modutils/* + - modprobe failes gracefully if the module is already loaded. (pending) + - implement depmod. (pending) + * debian/config* + - update + + -- Bastian Blank Wed, 30 Apr 2003 14:12:36 +0200 + +busybox-cvs (0.60.99.cvs20030426-1) unstable; urgency=low + + * new cvs version + + -- Bastian Blank Sat, 26 Apr 2003 18:33:17 +0200 + +busybox-cvs (0.60.99.cvs20030420-4) unstable; urgency=low + + * network/libiproute/iproute.c + - fix usage of ip route flush (upstream) + + -- Bastian Blank Fri, 25 Apr 2003 16:48:43 +0200 + +busybox-cvs (0.60.99.cvs20030420-3) unstable; urgency=low + + * debian/config-*udeb* + - update to busybox-applets.txt:1.10 + + -- Bastian Blank Fri, 25 Apr 2003 14:03:23 +0200 + +busybox-cvs (0.60.99.cvs20030420-2) unstable; urgency=low + + * archival/tar.c, archival/libunarchive/data_extract_all.c - unlink files first (upstream patch) - -- Bastian Blank Mon, 21 Apr 2003 12:06:57 +0200 + -- Bastian Blank Mon, 21 Apr 2003 12:42:06 +0200 busybox-cvs (0.60.99.cvs20030420-1) unstable; urgency=low diff --git a/debian/config-deb b/debian/config-deb index 4d63e69..0ccc668 100644 --- a/debian/config-deb +++ b/debian/config-deb @@ -16,6 +16,7 @@ CONFIG_FEATURE_INSTALLER=y # CONFIG_FEATURE_DEVPTS is not set # CONFIG_FEATURE_CLEAN_UP is not set # CONFIG_FEATURE_SUID is not set +# CONFIG_SELINUX is not set # # Build Options @@ -80,6 +81,7 @@ CONFIG_FEATURE_FANCY_ECHO=y # CONFIG_ENV is not set CONFIG_EXPR=y CONFIG_FALSE=y +# CONFIG_FOLD is not set CONFIG_HEAD=y # CONFIG_FEATURE_FANCY_HEAD is not set # CONFIG_HOSTID is not set @@ -107,6 +109,7 @@ CONFIG_PWD=y CONFIG_RM=y CONFIG_RMDIR=y # CONFIG_SHA1SUM is not set +# CONFIG_FEATURE_SHA1SUM_CHECK is not set CONFIG_SLEEP=y # CONFIG_FEATURE_FANCY_SLEEP is not set CONFIG_SORT=y @@ -168,12 +171,14 @@ CONFIG_RESET=y # CONFIG_MKTEMP is not set # CONFIG_READLINK is not set # CONFIG_RUN_PARTS is not set +# CONFIG_START_STOP_DAEMON is not set CONFIG_WHICH=y # # Editors # # CONFIG_AWK is not set +# CONFIG_PATCH is not set CONFIG_SED=y # CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set # CONFIG_VI is not set @@ -190,6 +195,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_CONTEXT is not set # CONFIG_XARGS is not set @@ -204,7 +210,6 @@ CONFIG_FEATURE_INITRD=y CONFIG_HALT=y CONFIG_POWEROFF=y CONFIG_REBOOT=y -# CONFIG_START_STOP_DAEMON is not set # CONFIG_MESG is not set # @@ -229,17 +234,18 @@ CONFIG_REBOOT=y # CONFIG_CROND is not set # CONFIG_CRONTAB is not set # CONFIG_DC is not set -# CONFIG_DUTMP 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_UPDATE is not set # CONFIG_WATCHDOG is not set # # Linux Module Utilities # +# CONFIG_DEPMOD is not set # CONFIG_INSMOD is not set # CONFIG_LSMOD is not set # CONFIG_MODPROBE is not set @@ -330,6 +336,7 @@ CONFIG_LOGGER=y CONFIG_DMESG=y # 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 @@ -341,10 +348,6 @@ CONFIG_LOSETUP=y CONFIG_MKSWAP=y CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y - -# -# Common options for ls and more -# # CONFIG_PIVOT_ROOT is not set # CONFIG_RDATE is not set CONFIG_SWAPONOFF=y diff --git a/debian/config-static b/debian/config-static index 454bbf2..233822c 100644 --- a/debian/config-static +++ b/debian/config-static @@ -16,6 +16,7 @@ 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 @@ -53,7 +54,7 @@ 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_OLDGNU_COMPATABILITY=y CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y CONFIG_FEATURE_UNARCHIVE_TAPE=y CONFIG_UNCOMPRESS=y @@ -82,6 +83,7 @@ CONFIG_DD=y CONFIG_DF=y CONFIG_DIRNAME=y CONFIG_DOS2UNIX=y +CONFIG_UNIX2DOS=y CONFIG_DU=y CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y CONFIG_ECHO=y @@ -89,8 +91,9 @@ CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y CONFIG_EXPR=y CONFIG_FALSE=y +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_LENGTH=y @@ -112,12 +115,13 @@ 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_FEATURE_SHA1SUM_CHECK=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 @@ -126,7 +130,7 @@ 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 # @@ -182,6 +186,7 @@ CONFIG_SETKEYCODES=y CONFIG_MKTEMP=y CONFIG_READLINK=y CONFIG_RUN_PARTS=y +CONFIG_START_STOP_DAEMON=y CONFIG_WHICH=y # @@ -189,6 +194,7 @@ CONFIG_WHICH=y # CONFIG_AWK=y CONFIG_FEATURE_AWK_MATH=y +CONFIG_PATCH=y CONFIG_SED=y # CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set CONFIG_VI=y @@ -215,6 +221,7 @@ CONFIG_FEATURE_FIND_NEWER=y CONFIG_FEATURE_FIND_INUM=y CONFIG_GREP=y CONFIG_FEATURE_GREP_EGREP_ALIAS=y +CONFIG_FEATURE_GREP_FGREP_ALIAS=y CONFIG_FEATURE_GREP_CONTEXT=y CONFIG_XARGS=y @@ -229,7 +236,6 @@ CONFIG_FEATURE_INITRD=y CONFIG_HALT=y CONFIG_POWEROFF=y CONFIG_REBOOT=y -CONFIG_START_STOP_DAEMON=y CONFIG_MESG=y # @@ -259,14 +265,15 @@ CONFIG_USE_BB_SHADOW=y # CONFIG_ADJTIMEX=y CONFIG_CROND=y +CONFIG_FEATURE_CROND_CALL_SENDMAIL=y CONFIG_CRONTAB=y CONFIG_DC=y -CONFIG_DUTMP=y +CONFIG_LAST=y +# CONFIG_HDPARM is not set CONFIG_MAKEDEVS=y CONFIG_MT=y CONFIG_STRINGS=y CONFIG_TIME=y -CONFIG_UPDATE=y CONFIG_WATCHDOG=y # @@ -288,11 +295,11 @@ CONFIG_HOSTNAME=y CONFIG_HTTPD=y # CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set CONFIG_FEATURE_HTTPD_BASIC_AUTH=y -# CONFIG_FEATURE_HTTPD_CGI is not set +# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set # CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set # CONFIG_FEATURE_HTTPD_SETUID is not set # CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set -# CONFIG_FEATURE_HTTPD_DECODE_URL_STR is not set +# CONFIG_FEATURE_HTTPD_CGI is not set # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set CONFIG_IFCONFIG=y CONFIG_FEATURE_IFCONFIG_STATUS=y @@ -302,6 +309,7 @@ CONFIG_FEATURE_IFCONFIG_HW=y CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y CONFIG_IFUPDOWN=y # CONFIG_FEATURE_IFUPDOWN_IP is not set +CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y CONFIG_FEATURE_IFUPDOWN_IPV4=y CONFIG_FEATURE_IFUPDOWN_IPV6=y CONFIG_FEATURE_IFUPDOWN_IPX=y @@ -354,7 +362,6 @@ CONFIG_FEATURE_TFTP_BLOCKSIZE=y CONFIG_FEATURE_TFTP_DEBUG=y CONFIG_TRACEROUTE=y CONFIG_FEATURE_TRACEROUTE_VERBOSE=y -CONFIG_FEATURE_TRACEROUTE_SO_DEBUG=y # CONFIG_VCONFIG is not set CONFIG_WGET=y CONFIG_FEATURE_WGET_STATUSBAR=y @@ -393,10 +400,6 @@ CONFIG_FEATURE_SH_IS_ASH=y CONFIG_ASH=y # -# ash (forced enabled as default shell) -# - -# # Ash Shell Options # CONFIG_ASH_JOB_CONTROL=y @@ -441,6 +444,7 @@ CONFIG_FBSET=y CONFIG_FEATURE_FBSET_FANCY=y CONFIG_FEATURE_FBSET_READMODE=y CONFIG_FDFLUSH=y +# CONFIG_FDFORMAT is not set CONFIG_FDISK=y CONFIG_FEATURE_FDISK_WRITABLE=y CONFIG_FEATURE_AIX_LABEL=y @@ -464,10 +468,6 @@ CONFIG_LOSETUP=y CONFIG_MKSWAP=y CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y - -# -# Common options for ls and more -# CONFIG_PIVOT_ROOT=y CONFIG_RDATE=y CONFIG_SWAPONOFF=y diff --git a/debian/config-udeb b/debian/config-udeb index b78c6a5..9679611 100644 --- a/debian/config-udeb +++ b/debian/config-udeb @@ -16,6 +16,7 @@ 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 @@ -50,7 +51,7 @@ 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_OLDGNU_COMPATABILITY 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 @@ -80,6 +81,7 @@ CONFIG_FEATURE_FANCY_ECHO=y CONFIG_ENV=y CONFIG_EXPR=y CONFIG_FALSE=y +# CONFIG_FOLD is not set CONFIG_HEAD=y # CONFIG_FEATURE_FANCY_HEAD is not set # CONFIG_HOSTID is not set @@ -101,7 +103,7 @@ CONFIG_MKDIR=y CONFIG_MKNOD=y CONFIG_MV=y # CONFIG_OD is not set -# CONFIG_PRINTF is not set +CONFIG_PRINTF=y CONFIG_PWD=y CONFIG_REALPATH=y CONFIG_RM=y @@ -171,12 +173,14 @@ CONFIG_FEATURE_HUMAN_READABLE=y # CONFIG_MKTEMP is not set CONFIG_READLINK=y # 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=y # CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set # CONFIG_VI is not set @@ -193,6 +197,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 is not set # CONFIG_FEATURE_GREP_CONTEXT is not set # CONFIG_XARGS is not set @@ -201,13 +206,12 @@ CONFIG_GREP=y # CONFIG_INIT=y CONFIG_FEATURE_USE_INITTAB=y -# CONFIG_FEATURE_INITRD is not set +CONFIG_FEATURE_INITRD=y # CONFIG_FEATURE_INIT_COREDUMPS is not set # CONFIG_FEATURE_EXTRA_QUIET is not set CONFIG_HALT=y # CONFIG_POWEROFF is not set CONFIG_REBOOT=y -# CONFIG_START_STOP_DAEMON is not set # CONFIG_MESG is not set # @@ -232,12 +236,12 @@ CONFIG_USE_BB_PWD_GRP=y # CONFIG_CROND is not set # CONFIG_CRONTAB is not set # CONFIG_DC is not set -# CONFIG_DUTMP 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_UPDATE is not set # CONFIG_WATCHDOG is not set # @@ -321,10 +325,6 @@ CONFIG_FEATURE_SH_IS_ASH=y CONFIG_ASH=y # -# ash (forced enabled as default shell) -# - -# # Ash Shell Options # # CONFIG_ASH_JOB_CONTROL is not set @@ -366,6 +366,7 @@ CONFIG_LOGGER=y CONFIG_DMESG=y # 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 @@ -377,10 +378,6 @@ CONFIG_DMESG=y CONFIG_MKSWAP=y CONFIG_MORE=y CONFIG_FEATURE_USE_TERMIOS=y - -# -# Common options for ls and more -# CONFIG_PIVOT_ROOT=y # CONFIG_RDATE is not set CONFIG_SWAPONOFF=y diff --git a/debian/control b/debian/control index c0a500c..d45758c 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: busybox-cvs Priority: optional Maintainer: Debian Install System Team Uploaders: Erik Andersen , Bastian Blank , Tollef Fog Heen , Glenn McGrath -Build-Depends: debhelper (>= 2.1.18) -Standards-Version: 3.5.7.0 +Build-Depends: debhelper (>= 4.0.0) +Standards-Version: 3.6.0 Package: busybox-cvs Architecture: any @@ -52,6 +52,7 @@ Architecture: any Depends: ${shlibs:Depends} Section: debian-installer Conflicts: busybox-udeb +Enhances: busybox-cvs-net-udeb Priority: extra Description: Tiny utilities for the debian-installer BusyBox combines tiny versions of many common UNIX utilities into a single -- cgit v1.1