From 76822c8c08c3090902fade2582e0f3e15bde3729 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 8 Feb 2008 09:11:44 +0000 Subject: busybox cleanup: * remove some outdated / in-between versions * remove angstrom-only defconfig in bb 1.7.2 * make 1.7.2 the new default preference --- packages/busybox/busybox-1.00/.mtn2git_empty | 0 .../busybox/busybox-1.00/add-getkey-applet.patch | 157 ---- packages/busybox/busybox-1.00/below.patch | 49 -- .../busybox/busybox-1.00/celf-ash-builtins.patch | 431 ---------- packages/busybox/busybox-1.00/console.patch | 13 - packages/busybox/busybox-1.00/defconfig | 476 ----------- packages/busybox/busybox-1.00/df.patch | 28 - packages/busybox/busybox-1.00/dhcp-hostname.patch | 25 - packages/busybox/busybox-1.00/dhcpretrytime.patch | 81 -- packages/busybox/busybox-1.00/fbset.patch | 24 - .../busybox/busybox-1.00/gzip-spurious-const.patch | 11 - packages/busybox/busybox-1.00/hdparm_M.patch | 47 -- .../busybox-1.00/ifupdown-spurious-environ.patch | 12 - .../busybox/busybox-1.00/iproute-flush-cache.patch | 23 - packages/busybox/busybox-1.00/linux-types.patch | 10 - packages/busybox/busybox-1.00/mount-all-type.patch | 84 -- packages/busybox/busybox-1.00/nylon/.mtn2git_empty | 0 packages/busybox/busybox-1.00/nylon/defconfig | 458 ----------- .../busybox/busybox-1.00/openmn/.mtn2git_empty | 0 packages/busybox/busybox-1.00/openmn/defconfig | 475 ----------- packages/busybox/busybox-1.00/readlink.patch | 85 -- packages/busybox/busybox-1.00/rmmod.patch | 44 -- .../busybox/busybox-1.00/slugos/.mtn2git_empty | 0 packages/busybox/busybox-1.00/slugos/defconfig | 461 ----------- .../busybox/busybox-1.00/slugos/udhcpscript.patch | 133 ---- packages/busybox/busybox-1.00/sparc/.mtn2git_empty | 0 packages/busybox/busybox-1.00/sparc/defconfig | 467 ----------- .../start-stop-daemon-oknodo-support.patch | 73 -- packages/busybox/busybox-1.00/uclibc_posix.patch | 20 - .../busybox-1.00/udhcppidfile-breakage.patch | 57 -- packages/busybox/busybox-1.00/udhcppidfile.patch | 276 ------- packages/busybox/busybox-1.00/udhcpscript.patch | 17 - .../busybox/busybox-1.00/unzip-endian-fixes.patch | 54 -- .../busybox-1.00/unzip-enhancement-and-fixes.patch | 878 --------------------- packages/busybox/busybox-1.00/wrt54/.mtn2git_empty | 0 packages/busybox/busybox-1.00/wrt54/defconfig | 476 ----------- .../busybox/busybox-1.00/xargs-double-size.patch | 13 - packages/busybox/busybox-1.01/.mtn2git_empty | 0 .../busybox/busybox-1.01/add-getkey-applet.patch | 157 ---- .../busybox/busybox-1.01/angstrom/.mtn2git_empty | 0 packages/busybox/busybox-1.01/angstrom/defconfig | 475 ----------- packages/busybox/busybox-1.01/below.patch | 49 -- packages/busybox/busybox-1.01/defconfig | 476 ----------- packages/busybox/busybox-1.01/dhcp-hostname.patch | 30 - packages/busybox/busybox-1.01/dhcpretrytime.patch | 81 -- .../busybox/busybox-1.01/familiar/.mtn2git_empty | 0 packages/busybox/busybox-1.01/familiar/defconfig | 470 ----------- packages/busybox/busybox-1.01/fbset.patch | 24 - packages/busybox/busybox-1.01/hdparm_M.patch | 47 -- .../busybox-1.01/ifupdown-spurious-environ.patch | 12 - .../busybox/busybox-1.01/iproute-flush-cache.patch | 23 - packages/busybox/busybox-1.01/mount-all-type.patch | 84 -- packages/busybox/busybox-1.01/nylon/.mtn2git_empty | 0 packages/busybox/busybox-1.01/nylon/defconfig | 458 ----------- .../busybox/busybox-1.01/openmn/.mtn2git_empty | 0 packages/busybox/busybox-1.01/openmn/defconfig | 475 ----------- packages/busybox/busybox-1.01/readlink.patch | 85 -- packages/busybox/busybox-1.01/rmmod.patch | 44 -- .../busybox/busybox-1.01/slugos/.mtn2git_empty | 0 packages/busybox/busybox-1.01/slugos/defconfig | 444 ----------- packages/busybox/busybox-1.01/slugos/sysctl.conf | 32 - .../busybox/busybox-1.01/slugos/udhcpscript.patch | 162 ---- packages/busybox/busybox-1.01/sparc/.mtn2git_empty | 0 packages/busybox/busybox-1.01/sparc/defconfig | 467 ----------- packages/busybox/busybox-1.01/thumb-bsdlabel.patch | 11 - packages/busybox/busybox-1.01/uclibc_posix.patch | 21 - .../busybox-1.01/udhcppidfile-breakage.patch | 57 -- packages/busybox/busybox-1.01/udhcppidfile.patch | 276 ------- packages/busybox/busybox-1.01/udhcpscript.patch | 17 - packages/busybox/busybox-1.01/wrt54/.mtn2git_empty | 0 packages/busybox/busybox-1.01/wrt54/defconfig | 476 ----------- .../busybox/busybox-1.01/xargs-double-size.patch | 13 - packages/busybox/busybox-1.2.0/.mtn2git_empty | 0 .../busybox/busybox-1.2.0/add-getkey-applet.patch | 167 ---- .../busybox/busybox-1.2.0/angstrom/.mtn2git_empty | 0 packages/busybox/busybox-1.2.0/angstrom/defconfig | 647 --------------- packages/busybox/busybox-1.2.0/below.patch | 46 -- packages/busybox/busybox-1.2.0/defconfig | 647 --------------- packages/busybox/busybox-1.2.0/dhcp-hostname.patch | 30 - packages/busybox/busybox-1.2.0/dhcpretrytime.patch | 85 -- packages/busybox/busybox-1.2.0/fbset.patch | 24 - packages/busybox/busybox-1.2.0/hdparm_M.patch | 47 -- .../busybox-1.2.0/ifupdown-spurious-environ.patch | 12 - .../busybox-1.2.0/iproute-flush-cache.patch | 23 - packages/busybox/busybox-1.2.0/mnci/.mtn2git_empty | 0 packages/busybox/busybox-1.2.0/mnci/defconfig | 643 --------------- .../busybox/busybox-1.2.0/mount-all-type.patch | 84 -- .../busybox/busybox-1.2.0/nylon/.mtn2git_empty | 0 packages/busybox/busybox-1.2.0/nylon/defconfig | 568 ------------- .../busybox/busybox-1.2.0/openslug/.mtn2git_empty | 0 .../busybox-1.2.0/openslug/udhcpscript.patch | 133 ---- packages/busybox/busybox-1.2.0/readlink.patch | 85 -- packages/busybox/busybox-1.2.0/rmmod.patch | 40 - .../busybox-1.2.0/udhcppidfile-breakage.patch | 57 -- packages/busybox/busybox-1.2.0/udhcppidfile.patch | 274 ------- packages/busybox/busybox-1.2.0/udhcpscript.patch | 17 - .../busybox/busybox-1.2.0/xargs-double-size.patch | 13 - packages/busybox/busybox-1.5.0/.mtn2git_empty | 0 .../busybox/busybox-1.5.0/angstrom/.mtn2git_empty | 0 packages/busybox/busybox-1.5.0/angstrom/defconfig | 647 --------------- packages/busybox/busybox-1.5.0/busybox-mdev.sh | 69 -- packages/busybox/busybox-1.5.0/defconfig | 647 --------------- packages/busybox/busybox-1.5.0/df_rootfs.patch | 44 -- packages/busybox/busybox-1.5.0/dhcp-hostname.patch | 20 - .../busybox-1.5.0/dhcp-increase-retries.patch | 11 - .../busybox-1.5.0/ifupdown-spurious-environ.patch | 16 - packages/busybox/busybox-1.5.0/mnci/.mtn2git_empty | 0 packages/busybox/busybox-1.5.0/mnci/defconfig | 643 --------------- .../busybox/busybox-1.5.0/nylon/.mtn2git_empty | 0 packages/busybox/busybox-1.5.0/nylon/defconfig | 568 ------------- .../busybox/busybox-1.5.0/slugos/.mtn2git_empty | 0 packages/busybox/busybox-1.5.0/slugos/defconfig | 686 ---------------- .../busybox/busybox-1.5.0/slugos/udhcpscript.patch | 133 ---- packages/busybox/busybox-1.5.0/udhcpscript.patch | 17 - .../busybox/busybox-1.5.0/xargs-double-size.patch | 13 - packages/busybox/busybox-1.6.0/.mtn2git_empty | 0 .../busybox/busybox-1.6.0/angstrom/.mtn2git_empty | 0 packages/busybox/busybox-1.6.0/angstrom/defconfig | 647 --------------- packages/busybox/busybox-1.6.0/busybox-mdev.sh | 69 -- packages/busybox/busybox-1.6.0/defconfig | 647 --------------- packages/busybox/busybox-1.6.0/df_rootfs.patch | 44 -- packages/busybox/busybox-1.6.0/dhcp-hostname.patch | 20 - .../busybox-1.6.0/dhcp-increase-retries.patch | 11 - .../busybox-1.6.0/ifupdown-spurious-environ.patch | 16 - packages/busybox/busybox-1.6.0/udhcpscript.patch | 17 - .../busybox/busybox-1.6.0/xargs-double-size.patch | 13 - .../busybox/busybox-1.7.2/angstrom/.mtn2git_empty | 0 packages/busybox/busybox-1.7.2/angstrom/defconfig | 753 ------------------ packages/busybox/busybox-1.7.2/defconfig | 753 ++++++++++++++++++ .../busybox/busybox-1.7.2/files/.mtn2git_empty | 0 packages/busybox/busybox_1.00.bb | 112 --- packages/busybox/busybox_1.01.bb | 111 --- packages/busybox/busybox_1.2.0.bb | 101 --- packages/busybox/busybox_1.5.0.bb | 104 --- packages/busybox/busybox_1.6.0.bb | 104 --- packages/busybox/busybox_1.7.2.bb | 17 +- 136 files changed, 760 insertions(+), 20359 deletions(-) delete mode 100644 packages/busybox/busybox-1.00/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.00/add-getkey-applet.patch delete mode 100644 packages/busybox/busybox-1.00/below.patch delete mode 100644 packages/busybox/busybox-1.00/celf-ash-builtins.patch delete mode 100644 packages/busybox/busybox-1.00/console.patch delete mode 100644 packages/busybox/busybox-1.00/defconfig delete mode 100644 packages/busybox/busybox-1.00/df.patch delete mode 100644 packages/busybox/busybox-1.00/dhcp-hostname.patch delete mode 100644 packages/busybox/busybox-1.00/dhcpretrytime.patch delete mode 100644 packages/busybox/busybox-1.00/fbset.patch delete mode 100644 packages/busybox/busybox-1.00/gzip-spurious-const.patch delete mode 100644 packages/busybox/busybox-1.00/hdparm_M.patch delete mode 100644 packages/busybox/busybox-1.00/ifupdown-spurious-environ.patch delete mode 100644 packages/busybox/busybox-1.00/iproute-flush-cache.patch delete mode 100644 packages/busybox/busybox-1.00/linux-types.patch delete mode 100644 packages/busybox/busybox-1.00/mount-all-type.patch delete mode 100644 packages/busybox/busybox-1.00/nylon/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.00/nylon/defconfig delete mode 100644 packages/busybox/busybox-1.00/openmn/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.00/openmn/defconfig delete mode 100644 packages/busybox/busybox-1.00/readlink.patch delete mode 100644 packages/busybox/busybox-1.00/rmmod.patch delete mode 100644 packages/busybox/busybox-1.00/slugos/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.00/slugos/defconfig delete mode 100644 packages/busybox/busybox-1.00/slugos/udhcpscript.patch delete mode 100644 packages/busybox/busybox-1.00/sparc/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.00/sparc/defconfig delete mode 100644 packages/busybox/busybox-1.00/start-stop-daemon-oknodo-support.patch delete mode 100644 packages/busybox/busybox-1.00/uclibc_posix.patch delete mode 100644 packages/busybox/busybox-1.00/udhcppidfile-breakage.patch delete mode 100644 packages/busybox/busybox-1.00/udhcppidfile.patch delete mode 100644 packages/busybox/busybox-1.00/udhcpscript.patch delete mode 100644 packages/busybox/busybox-1.00/unzip-endian-fixes.patch delete mode 100644 packages/busybox/busybox-1.00/unzip-enhancement-and-fixes.patch delete mode 100644 packages/busybox/busybox-1.00/wrt54/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.00/wrt54/defconfig delete mode 100644 packages/busybox/busybox-1.00/xargs-double-size.patch delete mode 100644 packages/busybox/busybox-1.01/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.01/add-getkey-applet.patch delete mode 100644 packages/busybox/busybox-1.01/angstrom/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.01/angstrom/defconfig delete mode 100644 packages/busybox/busybox-1.01/below.patch delete mode 100644 packages/busybox/busybox-1.01/defconfig delete mode 100644 packages/busybox/busybox-1.01/dhcp-hostname.patch delete mode 100644 packages/busybox/busybox-1.01/dhcpretrytime.patch delete mode 100644 packages/busybox/busybox-1.01/familiar/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.01/familiar/defconfig delete mode 100644 packages/busybox/busybox-1.01/fbset.patch delete mode 100644 packages/busybox/busybox-1.01/hdparm_M.patch delete mode 100644 packages/busybox/busybox-1.01/ifupdown-spurious-environ.patch delete mode 100644 packages/busybox/busybox-1.01/iproute-flush-cache.patch delete mode 100644 packages/busybox/busybox-1.01/mount-all-type.patch delete mode 100644 packages/busybox/busybox-1.01/nylon/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.01/nylon/defconfig delete mode 100644 packages/busybox/busybox-1.01/openmn/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.01/openmn/defconfig delete mode 100644 packages/busybox/busybox-1.01/readlink.patch delete mode 100644 packages/busybox/busybox-1.01/rmmod.patch delete mode 100644 packages/busybox/busybox-1.01/slugos/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.01/slugos/defconfig delete mode 100644 packages/busybox/busybox-1.01/slugos/sysctl.conf delete mode 100644 packages/busybox/busybox-1.01/slugos/udhcpscript.patch delete mode 100644 packages/busybox/busybox-1.01/sparc/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.01/sparc/defconfig delete mode 100644 packages/busybox/busybox-1.01/thumb-bsdlabel.patch delete mode 100644 packages/busybox/busybox-1.01/uclibc_posix.patch delete mode 100644 packages/busybox/busybox-1.01/udhcppidfile-breakage.patch delete mode 100644 packages/busybox/busybox-1.01/udhcppidfile.patch delete mode 100644 packages/busybox/busybox-1.01/udhcpscript.patch delete mode 100644 packages/busybox/busybox-1.01/wrt54/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.01/wrt54/defconfig delete mode 100644 packages/busybox/busybox-1.01/xargs-double-size.patch delete mode 100644 packages/busybox/busybox-1.2.0/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.2.0/add-getkey-applet.patch delete mode 100644 packages/busybox/busybox-1.2.0/angstrom/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.2.0/angstrom/defconfig delete mode 100644 packages/busybox/busybox-1.2.0/below.patch delete mode 100644 packages/busybox/busybox-1.2.0/defconfig delete mode 100644 packages/busybox/busybox-1.2.0/dhcp-hostname.patch delete mode 100644 packages/busybox/busybox-1.2.0/dhcpretrytime.patch delete mode 100644 packages/busybox/busybox-1.2.0/fbset.patch delete mode 100644 packages/busybox/busybox-1.2.0/hdparm_M.patch delete mode 100644 packages/busybox/busybox-1.2.0/ifupdown-spurious-environ.patch delete mode 100644 packages/busybox/busybox-1.2.0/iproute-flush-cache.patch delete mode 100644 packages/busybox/busybox-1.2.0/mnci/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.2.0/mnci/defconfig delete mode 100644 packages/busybox/busybox-1.2.0/mount-all-type.patch delete mode 100644 packages/busybox/busybox-1.2.0/nylon/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.2.0/nylon/defconfig delete mode 100644 packages/busybox/busybox-1.2.0/openslug/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.2.0/openslug/udhcpscript.patch delete mode 100644 packages/busybox/busybox-1.2.0/readlink.patch delete mode 100644 packages/busybox/busybox-1.2.0/rmmod.patch delete mode 100644 packages/busybox/busybox-1.2.0/udhcppidfile-breakage.patch delete mode 100644 packages/busybox/busybox-1.2.0/udhcppidfile.patch delete mode 100644 packages/busybox/busybox-1.2.0/udhcpscript.patch delete mode 100644 packages/busybox/busybox-1.2.0/xargs-double-size.patch delete mode 100644 packages/busybox/busybox-1.5.0/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.5.0/angstrom/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.5.0/angstrom/defconfig delete mode 100755 packages/busybox/busybox-1.5.0/busybox-mdev.sh delete mode 100644 packages/busybox/busybox-1.5.0/defconfig delete mode 100644 packages/busybox/busybox-1.5.0/df_rootfs.patch delete mode 100644 packages/busybox/busybox-1.5.0/dhcp-hostname.patch delete mode 100644 packages/busybox/busybox-1.5.0/dhcp-increase-retries.patch delete mode 100644 packages/busybox/busybox-1.5.0/ifupdown-spurious-environ.patch delete mode 100644 packages/busybox/busybox-1.5.0/mnci/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.5.0/mnci/defconfig delete mode 100644 packages/busybox/busybox-1.5.0/nylon/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.5.0/nylon/defconfig delete mode 100644 packages/busybox/busybox-1.5.0/slugos/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.5.0/slugos/defconfig delete mode 100644 packages/busybox/busybox-1.5.0/slugos/udhcpscript.patch delete mode 100644 packages/busybox/busybox-1.5.0/udhcpscript.patch delete mode 100644 packages/busybox/busybox-1.5.0/xargs-double-size.patch delete mode 100644 packages/busybox/busybox-1.6.0/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.6.0/angstrom/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.6.0/angstrom/defconfig delete mode 100755 packages/busybox/busybox-1.6.0/busybox-mdev.sh delete mode 100644 packages/busybox/busybox-1.6.0/defconfig delete mode 100644 packages/busybox/busybox-1.6.0/df_rootfs.patch delete mode 100644 packages/busybox/busybox-1.6.0/dhcp-hostname.patch delete mode 100644 packages/busybox/busybox-1.6.0/dhcp-increase-retries.patch delete mode 100644 packages/busybox/busybox-1.6.0/ifupdown-spurious-environ.patch delete mode 100644 packages/busybox/busybox-1.6.0/udhcpscript.patch delete mode 100644 packages/busybox/busybox-1.6.0/xargs-double-size.patch delete mode 100644 packages/busybox/busybox-1.7.2/angstrom/.mtn2git_empty delete mode 100644 packages/busybox/busybox-1.7.2/angstrom/defconfig create mode 100644 packages/busybox/busybox-1.7.2/defconfig create mode 100644 packages/busybox/busybox-1.7.2/files/.mtn2git_empty delete mode 100644 packages/busybox/busybox_1.00.bb delete mode 100644 packages/busybox/busybox_1.01.bb delete mode 100644 packages/busybox/busybox_1.2.0.bb delete mode 100644 packages/busybox/busybox_1.5.0.bb delete mode 100644 packages/busybox/busybox_1.6.0.bb diff --git a/packages/busybox/busybox-1.00/.mtn2git_empty b/packages/busybox/busybox-1.00/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/busybox/busybox-1.00/add-getkey-applet.patch b/packages/busybox/busybox-1.00/add-getkey-applet.patch deleted file mode 100644 index 6ce0df21bd..0000000000 --- a/packages/busybox/busybox-1.00/add-getkey-applet.patch +++ /dev/null @@ -1,157 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- /dev/null -+++ busybox-1.00/console-tools/getkey.c -@@ -0,0 +1,94 @@ -+/* vi: set sw=4 ts=4: */ -+/* -+ * getkey.c - Michael 'Mickey' Lauer -+ * -+ * Version 0.1 -+ * -+ * A simple keygrapper. Displays a configurable message and waits a dedicated number -+ * of seconds for a keypress. Sets the exit code accordingly (SUCCESS on keypress). -+ */ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "busybox.h" -+ -+extern int getkey_main(int argc, char **argv) -+{ -+ int status = EXIT_FAILURE; -+ -+ if ( argc < 2 ) -+ { -+ bb_show_usage(); -+ } -+ -+ /* -+ * If no terminal is attached it is quite useless -+ * to treat it like one. -+ */ -+ if( !isatty(STDIN_FILENO) ) -+ { -+ goto error_hard; -+ } -+ -+ //bb_printf( "DEBUG: time = '%s'\n", argv[1] ); -+ //bb_printf( "DEBUG: mesg = '%s'\n", argv[2] ); -+ -+ struct termios orig; -+ struct termios attr; -+ -+ if ( tcgetattr(STDIN_FILENO, &orig) == -1 ) -+ { -+ goto error_hard; -+ } -+ -+ attr = orig; -+ attr.c_cc[VMIN] = 0; -+ attr.c_cc[VTIME] = 0; -+ attr.c_iflag |= INLCR; -+ attr.c_oflag |= OPOST|ONLCR; -+ attr.c_cflag &= ~PARENB; -+ attr.c_lflag &= ~(ICANON/*|ECHO*/); -+ if ( tcsetattr(STDIN_FILENO,TCSANOW,&attr) == -1 ) -+ { -+ goto error_hard; -+ } -+ -+ fd_set rfds; -+ struct timeval tv; -+ int retval; -+ -+ FD_ZERO(&rfds); -+ FD_SET(0, &rfds); -+ -+ tv.tv_sec = atoi( argv[1] ); -+ tv.tv_usec = 0; -+ -+ if ( argc == 3 ) -+ { -+ bb_printf( argv[2], tv.tv_sec ); -+ bb_printf( "\n" ); -+ fflush(stdout); -+ } -+ retval = select(1, &rfds, NULL, NULL, &tv); -+ if (retval > 0) -+ { -+ status = EXIT_SUCCESS; -+ } -+ -+ if (tcsetattr(STDIN_FILENO,TCSANOW,&orig) == -1 ) -+ { -+ goto error_hard; -+ } -+ -+ return status; -+ -+error_hard : -+ return EXIT_FAILURE; -+}; -+ ---- busybox-1.00/console-tools/Makefile.in~add-getkey-applet.patch -+++ busybox-1.00/console-tools/Makefile.in -@@ -28,6 +28,7 @@ - CONSOLETOOLS_DIR-$(CONFIG_CLEAR) += clear.o - CONSOLETOOLS_DIR-$(CONFIG_DEALLOCVT) += deallocvt.o - CONSOLETOOLS_DIR-$(CONFIG_DUMPKMAP) += dumpkmap.o -+CONSOLETOOLS_DIR-$(CONFIG_GETKEY) += getkey.o - CONSOLETOOLS_DIR-$(CONFIG_LOADFONT) += loadfont.o - CONSOLETOOLS_DIR-$(CONFIG_LOADKMAP) += loadkmap.o - CONSOLETOOLS_DIR-$(CONFIG_OPENVT) += openvt.o ---- busybox-1.00/console-tools/Config.in~add-getkey-applet.patch -+++ busybox-1.00/console-tools/Config.in -@@ -31,6 +31,14 @@ - This program dumps the kernel's keyboard translation table to - stdout, in binary format. You can then use loadkmap to load it. - -+config CONFIG_GETKEY -+ bool "getkey" -+ default n -+ help -+ This program displays a configurable message and waits -+ a dedicated number of seconds for a keypress. It sets -+ the exit code accordingly, i.e. SUCCESS if there was a keypress. -+ - config CONFIG_LOADFONT - bool "loadfont" - default n ---- busybox-1.00/include/applets.h~add-getkey-applet.patch -+++ busybox-1.00/include/applets.h -@@ -223,6 +223,9 @@ - #ifdef CONFIG_FTPPUT - APPLET(ftpput, ftpgetput_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER) - #endif -+#ifdef CONFIG_GETKEY -+ APPLET(getkey, getkey_main, _BB_DIR_SBIN, _BB_SUID_NEVER) -+#endif - #ifdef CONFIG_GETOPT - APPLET(getopt, getopt_main, _BB_DIR_BIN, _BB_SUID_NEVER) - #endif ---- busybox-1.00/include/usage.h~add-getkey-applet.patch -+++ busybox-1.00/include/usage.h -@@ -734,6 +734,13 @@ - "\t-p, --password Password to be used\n" \ - "\t-P, --port Port number to be used" - -+#define getkey_trivial_usage \ -+ "time [message]" -+#define getkey_full_usage \ -+ "Display a message and wait for a keypress." -+#define getkey_example_usage \ -+ "$ getkey 5 'Press a key within %d seconds to interrupt autoboot.'" -+ - #define getopt_trivial_usage \ - "[OPTIONS]..." - #define getopt_full_usage \ diff --git a/packages/busybox/busybox-1.00/below.patch b/packages/busybox/busybox-1.00/below.patch deleted file mode 100644 index ec97b29962..0000000000 --- a/packages/busybox/busybox-1.00/below.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: modutils/modprobe.c -=================================================================== -RCS file: /var/cvs/busybox/modutils/modprobe.c,v -retrieving revision 1.41 -diff -u -r1.41 modprobe.c ---- busybox/modutils/modprobe.c 24 Sep 2004 09:18:55 -0000 1.41 -+++ busybox/modutils/modprobe.c 29 Dec 2004 11:56:07 -0000 -@@ -357,6 +357,41 @@ - } - } - } -+ else if ((strncmp (buffer, "below", 5) == 0) && isspace (buffer[5])) { -+ char *mod, *deps; -+ if (parse_tag_value (buffer + 6, &mod, &deps)) { -+ struct dep_t *dt; -+ -+ for (dt = first; dt; dt = dt->m_next) { -+ if (strcmp (dt->m_name, mod) == 0) -+ break; -+ } -+ if (dt) { -+ char *pp; -+ char *name; -+ -+ pp = name = deps; -+ -+ for (;;) { -+ while (*pp != 0 && !isspace (*pp)) -+ pp++; -+ if (isspace (*pp)) -+ *(pp++) = 0; -+ -+ dt->m_depcnt++; -+ dt->m_deparr = (char **) xrealloc (dt->m_deparr, -+ sizeof (char *) * dt->m_depcnt); -+ dt->m_deparr[dt->m_depcnt - 1] = bb_xstrdup (name); -+ -+ while (isspace (*pp)) -+ pp++; -+ name = pp; -+ if (*pp == 0) -+ break; -+ } -+ } -+ } -+ } - } - } - close ( fd ); diff --git a/packages/busybox/busybox-1.00/celf-ash-builtins.patch b/packages/busybox/busybox-1.00/celf-ash-builtins.patch deleted file mode 100644 index ec1925e6ad..0000000000 --- a/packages/busybox/busybox-1.00/celf-ash-builtins.patch +++ /dev/null @@ -1,431 +0,0 @@ -diff -Naur busybox-1.00-pre3.orig/coreutils/echo.c busybox-1.00-pre3/coreutils/echo.c ---- busybox-1.00-pre3.orig/coreutils/echo.c 2003-03-19 12:11:33.000000000 +0300 -+++ busybox-1.00-pre3/coreutils/echo.c 2003-11-07 17:47:35.000000000 +0300 -@@ -122,7 +122,11 @@ - #endif - - DONE: -- bb_fflush_stdout_and_exit(EXIT_SUCCESS); -+#ifdef CONFIG_FEATURE_BUILTIN_ECHO -+ return EXIT_SUCCESS; -+#else -+ bb_fflush_stdout_and_exit(EXIT_SUCCESS); -+#endif - } - - /*- -diff -Naur busybox-1.00-pre3.orig/coreutils/test.c busybox-1.00-pre3/coreutils/test.c ---- busybox-1.00-pre3.orig/coreutils/test.c 2003-07-15 01:20:45.000000000 +0400 -+++ busybox-1.00-pre3/coreutils/test.c 2003-11-07 17:47:35.000000000 +0300 -@@ -188,19 +188,19 @@ - /* Implement special cases from POSIX.2, section 4.62.4 */ - switch (argc) { - case 1: -- exit(1); -+ return (1); - case 2: -- exit(*argv[1] == '\0'); -+ return (*argv[1] == '\0'); - case 3: - if (argv[1][0] == '!' && argv[1][1] == '\0') { -- exit(!(*argv[2] == '\0')); -+ return (!(*argv[2] == '\0')); - } - break; - case 4: - if (argv[1][0] != '!' || argv[1][1] != '\0') { - if (t_lex(argv[2]), t_wp_op && t_wp_op->op_type == BINOP) { - t_wp = &argv[1]; -- exit(binop() == 0); -+ return (binop() == 0); - } - } - break; -@@ -208,7 +208,7 @@ - if (argv[1][0] == '!' && argv[1][1] == '\0') { - if (t_lex(argv[3]), t_wp_op && t_wp_op->op_type == BINOP) { - t_wp = &argv[2]; -- exit(!(binop() == 0)); -+ return (!(binop() == 0)); - } - } - break; -diff -Naur busybox-1.00-pre3.orig/include/usage.h busybox-1.00-pre3/include/usage.h ---- busybox-1.00-pre3.orig/include/usage.h 2003-08-29 18:18:26.000000000 +0400 -+++ busybox-1.00-pre3/include/usage.h 2003-11-07 17:47:59.000000000 +0300 -@@ -1760,6 +1760,13 @@ - "quit\n" \ - "221 foobar closing connection\n" - -+#define nice_trivial_usage \ -+ "[OPTION] [COMMAND [ARG]...]" -+#define nice_full_usage \ -+ "Run COMMAND with an adjusted scheduling priority." -+#define nice_example_usage \ -+ "$ nice -n 0 /tmp/foo \n" -+ - #define netstat_trivial_usage \ - "[-laenrtuwx]" - #define netstat_full_usage \ -diff -Naur busybox-1.00-pre3.orig/shell/Config.in busybox-1.00-pre3/shell/Config.in ---- busybox-1.00-pre3.orig/shell/Config.in 2003-09-12 08:51:25.000000000 +0400 -+++ busybox-1.00-pre3/shell/Config.in 2003-11-07 17:47:59.000000000 +0300 -@@ -53,6 +53,34 @@ - help - Enable job control in the ash shell. - -+config CONFIG_ASH_PIPE_OPTIMIZATION -+ bool " Enable ash pipe optimization " -+ default y -+ depends on CONFIG_ASH -+ help -+ Eliminate cat at the beginning of the pipe. -+ -+config CONFIG_FEATURE_BUILTIN_TEST -+ bool " Builtin test command" -+ default y -+ depends on CONFIG_ASH -+ help -+ Builtin test command" -+ -+config CONFIG_FEATURE_BUILTIN_ECHO -+ bool " Builtin echo command" -+ default y -+ depends on CONFIG_ASH -+ help -+ Builtin echo command" -+ -+config CONFIG_FEATURE_BUILTIN_PIDOF -+ bool " Builtin pidof command" -+ default y -+ depends on CONFIG_ASH && CONFIG_PIDOF -+ help -+ Builtin pidof command" -+ - config CONFIG_ASH_ALIAS - bool " Enable alias support" - default y -diff -Naur busybox-1.00-pre3.orig/shell/ash.c busybox-1.00-pre3/shell/ash.c ---- busybox-1.00-pre3.orig/shell/ash.c 2003-09-02 06:36:17.000000000 +0400 -+++ busybox-1.00-pre3/shell/ash.c 2003-11-07 17:47:59.000000000 +0300 -@@ -1259,6 +1259,16 @@ - #ifdef JOBS - static int killcmd(int, char **); - #endif -+#ifdef CONFIG_FEATURE_BUILTIN_TEST -+static int testcmd(int, char **); -+#endif -+#ifdef CONFIG_FEATURE_BUILTIN_ECHO -+static int echocmd(int, char**); -+#endif -+#ifdef CONFIG_FEATURE_BUILTIN_PIDOF -+static int pidofcmd(int, char **); -+#endif -+ - - /* $NetBSD: mail.h,v 1.9 2002/11/24 22:35:40 christos Exp $ */ - -@@ -1281,39 +1291,6 @@ - /* unsigned flags; */ - }; - --#ifdef CONFIG_ASH_CMDCMD --# ifdef JOBS --# ifdef CONFIG_ASH_ALIAS --# define COMMANDCMD (builtincmd + 7) --# define EXECCMD (builtincmd + 10) --# else --# define COMMANDCMD (builtincmd + 6) --# define EXECCMD (builtincmd + 9) --# endif --# else /* ! JOBS */ --# ifdef CONFIG_ASH_ALIAS --# define COMMANDCMD (builtincmd + 6) --# define EXECCMD (builtincmd + 9) --# else --# define COMMANDCMD (builtincmd + 5) --# define EXECCMD (builtincmd + 8) --# endif --# endif /* JOBS */ --#else /* ! CONFIG_ASH_CMDCMD */ --# ifdef JOBS --# ifdef CONFIG_ASH_ALIAS --# define EXECCMD (builtincmd + 9) --# else --# define EXECCMD (builtincmd + 8) --# endif --# else /* ! JOBS */ --# ifdef CONFIG_ASH_ALIAS --# define EXECCMD (builtincmd + 8) --# else --# define EXECCMD (builtincmd + 7) --# endif --# endif /* JOBS */ --#endif /* CONFIG_ASH_CMDCMD */ - - #define BUILTIN_NOSPEC "0" - #define BUILTIN_SPECIAL "1" -@@ -1328,65 +1305,21 @@ - #define IS_BUILTIN_REGULAR(builtincmd) ((builtincmd)->name[0] & 2) - - static const struct builtincmd builtincmd[] = { -- { BUILTIN_SPEC_REG ".", dotcmd }, -- { BUILTIN_SPEC_REG ":", truecmd }, --#ifdef CONFIG_ASH_ALIAS -- { BUILTIN_REG_ASSG "alias", aliascmd }, --#endif --#ifdef JOBS -- { BUILTIN_REGULAR "bg", bgcmd }, --#endif -- { BUILTIN_SPEC_REG "break", breakcmd }, -- { BUILTIN_REGULAR "cd", cdcmd }, -- { BUILTIN_NOSPEC "chdir", cdcmd }, --#ifdef CONFIG_ASH_CMDCMD -- { BUILTIN_REGULAR "command", commandcmd }, --#endif -- { BUILTIN_SPEC_REG "continue", breakcmd }, -- { BUILTIN_SPEC_REG "eval", evalcmd }, -- { BUILTIN_SPEC_REG "exec", execcmd }, -- { BUILTIN_SPEC_REG "exit", exitcmd }, -- { BUILTIN_SPEC_REG_ASSG "export", exportcmd }, -- { BUILTIN_REGULAR "false", falsecmd }, --#ifdef JOBS -- { BUILTIN_REGULAR "fg", fgcmd }, --#endif --#ifdef CONFIG_ASH_GETOPTS -- { BUILTIN_REGULAR "getopts", getoptscmd }, --#endif -- { BUILTIN_NOSPEC "hash", hashcmd }, --#ifndef CONFIG_FEATURE_SH_EXTRA_QUIET -- { BUILTIN_NOSPEC "help", helpcmd }, --#endif --#ifdef JOBS -- { BUILTIN_REGULAR "jobs", jobscmd }, -- { BUILTIN_REGULAR "kill", killcmd }, --#endif --#ifdef CONFIG_ASH_MATH_SUPPORT -- { BUILTIN_NOSPEC "let", letcmd }, --#endif -- { BUILTIN_ASSIGN "local", localcmd }, -- { BUILTIN_NOSPEC "pwd", pwdcmd }, -- { BUILTIN_REGULAR "read", readcmd }, -- { BUILTIN_SPEC_REG_ASSG "readonly", exportcmd }, -- { BUILTIN_SPEC_REG "return", returncmd }, -- { BUILTIN_SPEC_REG "set", setcmd }, -- { BUILTIN_SPEC_REG "shift", shiftcmd }, -- { BUILTIN_SPEC_REG "times", timescmd }, -- { BUILTIN_SPEC_REG "trap", trapcmd }, -- { BUILTIN_REGULAR "true", truecmd }, -- { BUILTIN_NOSPEC "type", typecmd }, -- { BUILTIN_NOSPEC "ulimit", ulimitcmd }, -- { BUILTIN_REGULAR "umask", umaskcmd }, --#ifdef CONFIG_ASH_ALIAS -- { BUILTIN_REGULAR "unalias", unaliascmd }, --#endif -- { BUILTIN_SPEC_REG "unset", unsetcmd }, -- { BUILTIN_REGULAR "wait", waitcmd }, -+#define BUILTIN_COMMAND_SPEC(code, str, func) {str, func}, -+#include "ash.d" -+{} - }; - --#define NUMBUILTINS (sizeof (builtincmd) / sizeof (struct builtincmd) ) -+enum { -+#define BUILTIN_COMMAND_SPEC(code, str, func) code, -+#include "ash.d" -+NUMBUILTINS -+}; - -+#ifdef CONFIG_ASH_CMDCMD -+#define COMMANDCMD (builtincmd + COMMAND_CMD) -+#endif -+#define EXECCMD (builtincmd + EXEC_CMD) - - - struct cmdentry { -@@ -1678,7 +1611,8 @@ - - /* from input.c: */ - { -- basepf.nextc = basepf.buf = basebuf; -+ struct parsefile* pf = &basepf; -+ pf->nextc = pf->buf = basebuf; - } - - /* from trap.c: */ -@@ -2678,6 +2612,14 @@ - * Called to reset things after an exception. - */ - -+#ifdef CONFIG_FEATURE_BUILTIN_ECHO -+static int -+echocmd(int argc, char **argv) -+{ -+ return echo_main(argc, argv); -+} -+#endif -+ - /* - * The eval commmand. - */ -@@ -3028,6 +2970,23 @@ - } - - -+static int -+cat_file(union node *n) -+{ -+#ifdef CONFIG_ASH_PIPE_OPTIMIZATION -+ if (n->type == NCMD -+ && n->ncmd.args != NULL -+ && strcmp(n->ncmd.args->narg.text, "cat") == 0 -+ && n->ncmd.args->narg.next != NULL -+ && *n->ncmd.args->narg.next->narg.text != '-' -+ && n->ncmd.args->narg.next->narg.next == NULL) -+ { -+ return open(n->ncmd.args->narg.next->narg.text, O_RDONLY); -+ } -+#endif -+ return -1; -+} -+ - - /* - * Evaluate a pipeline. All the processes in the pipeline are children -@@ -3057,7 +3016,11 @@ - prehash(lp->n); - pip[1] = -1; - if (lp->next) { -- if (pipe(pip) < 0) { -+ if (prevfd < 0 && (prevfd = cat_file(lp->n)) >= 0) { -+ // it is cat at the beginning of the pipe -+ continue; -+ } -+ if (pipe(pip) < 0) { - close(prevfd); - error("Pipe call failed"); - } -@@ -3104,11 +3067,11 @@ - { - int saveherefd; - -- result->fd = -1; -+ result->fd = cat_file(n); - result->buf = NULL; - result->nleft = 0; - result->jp = NULL; -- if (n == NULL) { -+ if (n == NULL || result->fd >= 0) { - goto out; - } - -@@ -3562,6 +3525,24 @@ - } - } - -+#ifdef CONFIG_FEATURE_BUILTIN_TEST -+static int -+testcmd(int argc, char** argv) -+{ -+ bb_applet_name = argv[0]; -+ return test_main(argc, argv); -+} -+#endif -+ -+#ifdef CONFIG_FEATURE_BUILTIN_PIDOF -+static int -+pidofcmd(int argc, char** argv) -+{ -+ bb_applet_name = argv[0]; -+ return pidof_main(argc, argv); -+} -+#endif -+ - - static int - falsecmd(int argc, char **argv) -@@ -4943,7 +4924,9 @@ - ckfree(in.buf); - if (in.fd >= 0) { - close(in.fd); -- back_exitstatus = waitforjob(in.jp); -+ if (in.jp != NULL) { -+ back_exitstatus = waitforjob(in.jp); -+ } - } - INTON; - -diff -Naur busybox-1.00-pre3.orig/shell/ash.d busybox-1.00-pre3/shell/ash.d ---- busybox-1.00-pre3.orig/shell/ash.d 1970-01-01 03:00:00.000000000 +0300 -+++ busybox-1.00-pre3/shell/ash.d 2003-11-07 17:47:59.000000000 +0300 -@@ -0,0 +1,70 @@ -+BUILTIN_COMMAND_SPEC(DOT_CMD, BUILTIN_SPEC_REG ".", dotcmd) -+BUILTIN_COMMAND_SPEC(COMMA_CMD, BUILTIN_SPEC_REG ":", truecmd) -+#ifdef CONFIG_FEATURE_BUILTIN_TEST -+BUILTIN_COMMAND_SPEC(RPAR_CMD, BUILTIN_REGULAR "[", testcmd) -+#endif -+#ifdef CONFIG_ASH_ALIAS -+BUILTIN_COMMAND_SPEC(ALIAS_CMD, BUILTIN_REG_ASSG "alias", aliascmd) -+#endif -+#ifdef JOBS -+BUILTIN_COMMAND_SPEC(BG_CMD, BUILTIN_REGULAR "bg", bgcmd) -+#endif -+BUILTIN_COMMAND_SPEC(BREAK_CMD, BUILTIN_SPEC_REG "break", breakcmd) -+BUILTIN_COMMAND_SPEC(CD_CMD, BUILTIN_REGULAR "cd", cdcmd) -+BUILTIN_COMMAND_SPEC(CHDIR_CMD, BUILTIN_NOSPEC "chdir", cdcmd) -+#ifdef CONFIG_ASH__CMD_CMD -+BUILTIN_COMMAND_SPEC(COMMAND_CMD, BUILTIN_REGULAR "command", commandcmd) -+#endif -+BUILTIN_COMMAND_SPEC(CONTINUE_CMD,BUILTIN_SPEC_REG "continue", breakcmd) -+#ifdef CONFIG_FEATURE_BUILTIN_ECHO -+BUILTIN_COMMAND_SPEC(ECHO_CMD, BUILTIN_REGULAR "echo", echocmd) -+#endif -+BUILTIN_COMMAND_SPEC(EVAL_CMD, BUILTIN_SPEC_REG "eval", evalcmd) -+BUILTIN_COMMAND_SPEC(EXEC_CMD, BUILTIN_SPEC_REG "exec", execcmd) -+BUILTIN_COMMAND_SPEC(EXIT_CMD, BUILTIN_SPEC_REG "exit", exitcmd) -+BUILTIN_COMMAND_SPEC(EXPORT_CMD, BUILTIN_SPEC_REG_ASSG "export", exportcmd) -+BUILTIN_COMMAND_SPEC(FALSE_CMD, BUILTIN_REGULAR "false", falsecmd) -+#ifdef JOBS -+BUILTIN_COMMAND_SPEC(FG_CMD, BUILTIN_REGULAR "fg", fgcmd) -+#endif -+#ifdef CONFIG_ASH_GETOPTS -+BUILTIN_COMMAND_SPEC(GETOPTS_CMD, BUILTIN_REGULAR "getopts", getoptscmd) -+#endif -+BUILTIN_COMMAND_SPEC(HASH_CMD, BUILTIN_NOSPEC "hash", hashcmd) -+#ifndef CONFIG_FEATURE_SH_EXTRA_QUIET -+BUILTIN_COMMAND_SPEC(HELP_CMD, BUILTIN_NOSPEC "help", helpcmd) -+#endif -+#ifdef JOBS -+BUILTIN_COMMAND_SPEC(JOBS_CMD, BUILTIN_REGULAR "jobs", jobscmd) -+BUILTIN_COMMAND_SPEC(KILL_CMD, BUILTIN_REGULAR "kill", killcmd) -+#endif -+#ifdef CONFIG_ASH_MATH_SUPPORT -+BUILTIN_COMMAND_SPEC(LET_CMD, BUILTIN_NOSPEC "let", letcmd) -+#endif -+BUILTIN_COMMAND_SPEC(LOCAL_CMD, BUILTIN_ASSIGN "local", localcmd) -+#ifdef CONFIG_FEATURE_BUILTIN_PIDOF -+BUILTIN_COMMAND_SPEC(PIDOF_CMD, BUILTIN_REGULAR "pidof", pidofcmd) -+#endif -+BUILTIN_COMMAND_SPEC(PWD_CMD, BUILTIN_NOSPEC "pwd", pwdcmd) -+BUILTIN_COMMAND_SPEC(READ_CMD, BUILTIN_REGULAR "read", readcmd) -+BUILTIN_COMMAND_SPEC(READONLY_CMD,BUILTIN_SPEC_REG_ASSG "readonly", exportcmd) -+BUILTIN_COMMAND_SPEC(RETURN_CMD, BUILTIN_SPEC_REG "return", returncmd) -+BUILTIN_COMMAND_SPEC(SET_CMD, BUILTIN_SPEC_REG "set", setcmd) -+BUILTIN_COMMAND_SPEC(SHIFT_CMD, BUILTIN_SPEC_REG "shift", shiftcmd) -+#ifdef CONFIG_FEATURE_BUILTIN_TEST -+BUILTIN_COMMAND_SPEC(TEST_CMD, BUILTIN_REGULAR "test", testcmd) -+#endif -+BUILTIN_COMMAND_SPEC(TIMES_CMD, BUILTIN_SPEC_REG "times", timescmd) -+BUILTIN_COMMAND_SPEC(TRAP_CMD, BUILTIN_SPEC_REG "trap", trapcmd) -+BUILTIN_COMMAND_SPEC(TRUE_CMD, BUILTIN_REGULAR "true", truecmd) -+BUILTIN_COMMAND_SPEC(TYPE_CMD, BUILTIN_NOSPEC "type", typecmd) -+BUILTIN_COMMAND_SPEC(ULIMIT_CMD, BUILTIN_NOSPEC "ulimit", ulimitcmd) -+BUILTIN_COMMAND_SPEC(UMASK_CMD, BUILTIN_REGULAR "umask", umaskcmd) -+#ifdef CONFIG_ASH_ALIAS -+BUILTIN_COMMAND_SPEC(UNALIAS_CMD, BUILTIN_REGULAR "unalias", unaliascmd) -+#endif -+BUILTIN_COMMAND_SPEC(UNSET_CMD, BUILTIN_SPEC_REG "unset", unsetcmd) -+BUILTIN_COMMAND_SPEC(WAIT_CMD, BUILTIN_REGULAR "wait", waitcmd) -+ -+ -+#undef BUILTIN_COMMAND_SPEC diff --git a/packages/busybox/busybox-1.00/console.patch b/packages/busybox/busybox-1.00/console.patch deleted file mode 100644 index d57bdfbe89..0000000000 --- a/packages/busybox/busybox-1.00/console.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- busybox-1.00-pre2/libbb/get_console.c~console -+++ busybox-1.00-pre2/libbb/get_console.c -@@ -86,10 +86,6 @@ - { - int fd; - -- if (-1 == (fd = open_a_console("/dev/console"))) -- return -1; -- else -- return fd; - fd = open_a_console(CURRENT_TTY); - if (fd >= 0) - return fd; diff --git a/packages/busybox/busybox-1.00/defconfig b/packages/busybox/busybox-1.00/defconfig deleted file mode 100644 index 8b8212c54a..0000000000 --- a/packages/busybox/busybox-1.00/defconfig +++ /dev/null @@ -1,476 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y - -# -# General Configuration -# -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# 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=y -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -CONFIG_BUNZIP2=y -CONFIG_CPIO=y -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -CONFIG_GUNZIP=y -# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set -CONFIG_GZIP=y -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -CONFIG_FEATURE_TAR_BZIP2=y -CONFIG_FEATURE_TAR_FROM=y -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_TAR_LONG_OPTIONS is not set -# CONFIG_UNCOMPRESS is not set -CONFIG_UNZIP=y - -# -# Common options for cpio and tar -# -# CONFIG_FEATURE_UNARCHIVE_TAPE is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -CONFIG_CHROOT=y -# CONFIG_CMP is not set -CONFIG_CP=y -CONFIG_CUT=y -CONFIG_DATE=y - -# -# date (forced enabled for use with watch) -# -# CONFIG_FEATURE_DATE_ISOFMT is not set -CONFIG_DD=y -CONFIG_DF=y -CONFIG_DIRNAME=y -# CONFIG_DOS2UNIX is not set -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -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 -CONFIG_ID=y -# CONFIG_INSTALL is not set -# CONFIG_LENGTH is not set -CONFIG_LN=y -CONFIG_LOGNAME=y -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -# CONFIG_FEATURE_LS_RECURSIVE is not set -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -CONFIG_MD5SUM=y -CONFIG_MKDIR=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_OD=y -CONFIG_PRINTF=y -CONFIG_PWD=y -# CONFIG_REALPATH is not set -CONFIG_RM=y -CONFIG_RMDIR=y -CONFIG_SEQ=y -# CONFIG_SHA1SUM is not set -CONFIG_SLEEP=y -# CONFIG_FEATURE_FANCY_SLEEP is not set -CONFIG_SORT=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_TEST=y - -# -# test (forced enabled for use with shell) -# -# CONFIG_FEATURE_TEST_64 is not set -CONFIG_TOUCH=y -CONFIG_TR=y -CONFIG_TRUE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNIQ=y -# CONFIG_USLEEP is not set -# CONFIG_UUDECODE is not set -# CONFIG_UUENCODE is not set -CONFIG_WATCH=y -CONFIG_WC=y -CONFIG_WHO=y -CONFIG_WHOAMI=y -CONFIG_YES=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 - -# -# Common options for md5sum, sha1sum -# -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -CONFIG_GETKEY=y -CONFIG_LOADFONT=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -CONFIG_RESET=y -# CONFIG_SETKEYCODES is not set - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -# CONFIG_PIPE_PROGRESS is not set -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_RUN_PARTS=y -CONFIG_START_STOP_DAEMON=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -CONFIG_FEATURE_AWK_MATH=y -# CONFIG_PATCH is not set -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -CONFIG_FEATURE_VI_USE_SIGNALS=y -# CONFIG_FEATURE_VI_DOT_CMD is not set -# CONFIG_FEATURE_VI_READONLY is not set -# CONFIG_FEATURE_VI_SETOPTS is not set -# CONFIG_FEATURE_VI_SET is not set -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y - -# -# Finding Utilities -# -CONFIG_FIND=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -CONFIG_FEATURE_FIND_NEWER=y -# CONFIG_FEATURE_FIND_INUM is not set -CONFIG_GREP=y -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 -# -# CONFIG_INIT is not set -# CONFIG_HALT is not set -# CONFIG_POWEROFF is not set -# CONFIG_REBOOT is not set -# CONFIG_MESG is not set - -# -# Login/Password Management Utilities -# -# CONFIG_USE_BB_PWD_GRP is not set -# 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_FEATURE_U_W_TMP=y -# 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=y -# 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_RX is not set -CONFIG_STRINGS=y -# CONFIG_TIME is not set -# CONFIG_WATCHDOG is not set - -# -# Linux Module Utilities -# -CONFIG_INSMOD=y -CONFIG_FEATURE_2_4_MODULES=y -CONFIG_FEATURE_2_6_MODULES=y -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -CONFIG_FEATURE_INSMOD_LOAD_MAP=y -CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y -CONFIG_LSMOD=y -CONFIG_MODPROBE=y -CONFIG_RMMOD=y -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -# CONFIG_ARPING is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -CONFIG_HOSTNAME=y -# CONFIG_HTTPD is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -# CONFIG_FEATURE_IFCONFIG_SLIP is not set -# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -CONFIG_FEATURE_IFCONFIG_HW=y -# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set -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 is not set -CONFIG_FEATURE_IFUPDOWN_MAPPING=y -# CONFIG_INETD is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_TUNNEL=y -# 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=y -CONFIG_NETSTAT=y -CONFIG_NSLOOKUP=y -CONFIG_PING=y -CONFIG_FEATURE_FANCY_PING=y -CONFIG_PING6=y -CONFIG_FEATURE_FANCY_PING6=y -CONFIG_ROUTE=y -CONFIG_TELNET=y -# CONFIG_FEATURE_TELNET_TTYPE is not set -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -# CONFIG_TELNETD is not set -CONFIG_TFTP=y -CONFIG_TRACEROUTE=y -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_IP6_LITERAL=y - -# -# udhcp Server/Client -# -CONFIG_UDHCPD=y -CONFIG_UDHCPC=y -CONFIG_FEATURE_UDHCP_SYSLOG=y -# CONFIG_FEATURE_UDHCP_DEBUG is not set - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_KILL=y -CONFIG_KILLALL=y -# CONFIG_PIDOF is not set -CONFIG_PS=y -CONFIG_RENICE=y -CONFIG_TOP=y -FEATURE_CPU_USAGE_PERCENTAGE=y -CONFIG_UPTIME=y -# CONFIG_SYSCTL 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=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_MATH_SUPPORT=y -# CONFIG_ASH_MATH_SUPPORT_64 is not set -CONFIG_ASH_GETOPTS=y -# CONFIG_ASH_CMDCMD is not set -# CONFIG_ASH_MAIL is not set -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_RANDOM_SUPPORT is not set -# CONFIG_HUSH is not set -# CONFIG_LASH is not set -# CONFIG_MSH is not set - -# -# Bourne Shell Options -# -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set -CONFIG_FEATURE_COMMAND_EDITING=y -CONFIG_FEATURE_COMMAND_HISTORY=63 -# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set -CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y -# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set -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_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 -CONFIG_LOGREAD=y -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -CONFIG_KLOGD=y -CONFIG_LOGGER=y - -# -# Linux System Utilities -# -CONFIG_DMESG=y -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFLUSH is not set -# CONFIG_FDFORMAT is not set -CONFIG_FDISK=y -FDISK_SUPPORT_LARGE_DISKS=y -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FREERAMDISK is not set -CONFIG_FSCK_MINIX=y -CONFIG_MKFS_MINIX=y - -# -# Minix filesystem support -# -CONFIG_FEATURE_MINIX2=y -# CONFIG_GETOPT is not set -CONFIG_HEXDUMP=y -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y -CONFIG_LOSETUP=y -CONFIG_MKSWAP=y -CONFIG_MORE=y -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_PIVOT_ROOT=y -# CONFIG_RDATE is not set -CONFIG_SWAPONOFF=y -CONFIG_MOUNT=y -CONFIG_NFSMOUNT=y -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/packages/busybox/busybox-1.00/df.patch b/packages/busybox/busybox-1.00/df.patch deleted file mode 100644 index 49888293fd..0000000000 --- a/packages/busybox/busybox-1.00/df.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- busybox-1.00/coreutils/df.c.orig 2006-07-14 09:50:47.914912750 -0400 -+++ busybox-1.00/coreutils/df.c 2006-07-14 09:52:32.613456000 -0400 -@@ -60,6 +60,7 @@ - struct statfs s; - static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */ - const char *disp_units_hdr = hdr_1k; -+ int root_done = 0; - - #ifdef CONFIG_FEATURE_HUMAN_READABLE - bb_opt_complementaly = "h-km:k-hm:m-hk"; -@@ -125,14 +126,14 @@ - ) / (blocks_used + s.f_bavail); - } - -- if (strcmp(device, "rootfs") == 0) { -- continue; -- } else if (strcmp(device, "/dev/root") == 0) { -+ if (strcmp(device, "/dev/root") == 0 || strcmp(device, "rootfs") == 0) { -+ if (root_done) continue; - /* Adjusts device to be the real root device, - * or leaves device alone if it can't find it */ - if ((device = find_real_root_device_name()) == NULL) { - goto SET_ERROR; - } -+ root_done = 1; - } - - #ifdef CONFIG_FEATURE_HUMAN_READABLE diff --git a/packages/busybox/busybox-1.00/dhcp-hostname.patch b/packages/busybox/busybox-1.00/dhcp-hostname.patch deleted file mode 100644 index 5eb77a8e10..0000000000 --- a/packages/busybox/busybox-1.00/dhcp-hostname.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- busybox/networking/udhcp/dhcpc.c 2005-05-25 11:49:24.000000000 +0100 -+++ busybox/networking/udhcp/dhcpc.c 2005-05-25 12:54:30.000000000 +0100 -@@ -193,6 +193,7 @@ - long now; - int max_fd; - int sig; -+ char hostbuf[256]; /* SUSv2: hostnames are <= 255 bytes */ - - static const struct option arg_options[] = { - {"clientid", required_argument, 0, 'c'}, -@@ -211,6 +212,14 @@ - {0, 0, 0, 0} - }; - -+ if (gethostname (hostbuf, sizeof (hostbuf)) == 0) { -+ len = strlen (hostbuf); -+ client_config.hostname = xmalloc (len + 2); -+ client_config.hostname[OPT_CODE] = DHCP_HOST_NAME; -+ client_config.hostname[OPT_LEN] = len; -+ strncpy(client_config.hostname + 2, hostbuf, len); -+ } -+ - /* get options */ - while (1) { - int option_index = 0; diff --git a/packages/busybox/busybox-1.00/dhcpretrytime.patch b/packages/busybox/busybox-1.00/dhcpretrytime.patch deleted file mode 100644 index c55a38552f..0000000000 --- a/packages/busybox/busybox-1.00/dhcpretrytime.patch +++ /dev/null @@ -1,81 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- busybox-1.00-rc3/networking/udhcp/dhcpc.c~dhcpretrytime -+++ busybox-1.00-rc3/networking/udhcp/dhcpc.c -@@ -48,6 +48,7 @@ - static unsigned long requested_ip; /* = 0 */ - static unsigned long server_addr; - static unsigned long timeout; -+static unsigned long retrytime = 60; - static int packet_num; /* = 0 */ - static int fd = -1; - -@@ -90,6 +91,7 @@ - " -r, --request=IP IP address to request (default: none)\n" - " -s, --script=file Run file at dhcp events (default:\n" - " " DEFAULT_SCRIPT ")\n" -+" -t, --retrytime time to retry DHCP request (default 60s)\n") - " -v, --version Display version\n" - ); - exit(0); -@@ -204,6 +206,7 @@ - {"quit", no_argument, 0, 'q'}, - {"request", required_argument, 0, 'r'}, - {"script", required_argument, 0, 's'}, -+ {"retrytime", required_argument, 0, 't'}, - {"version", no_argument, 0, 'v'}, - {0, 0, 0, 0} - }; -@@ -211,7 +214,7 @@ - /* get options */ - while (1) { - int option_index = 0; -- c = getopt_long(argc, argv, "c:fbH:h:i:np:qr:s:v", arg_options, &option_index); -+ c = getopt_long(argc, argv, "c:fbH:h:i:np:qr:s:t:v", arg_options, &option_index); - if (c == -1) break; - - switch (c) { -@@ -257,6 +260,9 @@ - case 's': - client_config.script = optarg; - break; -+ case 't': -+ retrytime = atol(optarg); -+ break; - case 'v': - printf("udhcpcd, version %s\n\n", VERSION); - return 0; -@@ -335,7 +341,7 @@ - } - /* wait to try again */ - packet_num = 0; -- timeout = now + 60; -+ timeout = now + retrytime; - } - break; - case RENEW_REQUESTED: ---- busybox-1.00-rc3/networking/ifupdown.c~dhcpretrytime -+++ busybox-1.00-rc3/networking/ifupdown.c -@@ -538,7 +538,7 @@ - static int dhcp_up(struct interface_defn_t *ifd, execfn *exec) - { - if (execable("/sbin/udhcpc")) { -- return( execute("udhcpc -n -p /var/run/udhcpc.%iface%.pid -i " -+ return( execute("udhcpc -b -p /var/run/udhcpc.%iface%.pid -i " - "%iface% [[-H %hostname%]] [[-c %clientid%]]", ifd, exec)); - } else if (execable("/sbin/pump")) { - return( execute("pump -i %iface% [[-h %hostname%]] [[-l %leasehours%]]", ifd, exec)); -@@ -558,8 +558,8 @@ - /* SIGUSR2 forces udhcpc to release the current lease and go inactive, - * and SIGTERM causes udhcpc to exit. Signals are queued and processed - * sequentially so we don't need to sleep */ -- result = execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); -- result += execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); -+ result = execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid 2>/dev/null` 2>/dev/null", ifd, exec); -+ result += execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid 2>/dev/null` 2>/dev/null", ifd, exec); - } else if (execable("/sbin/pump")) { - result = execute("pump -i %iface% -k", ifd, exec); - } else if (execable("/sbin/dhclient")) { diff --git a/packages/busybox/busybox-1.00/fbset.patch b/packages/busybox/busybox-1.00/fbset.patch deleted file mode 100644 index d0609ce6f7..0000000000 --- a/packages/busybox/busybox-1.00/fbset.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- busybox/util-linux/fbset.c~ 2004-07-03 16:24:23.000000000 +0100 -+++ busybox/util-linux/fbset.c 2004-12-30 20:09:26.000000000 +0000 -@@ -337,7 +337,7 @@ - { - struct fb_var_screeninfo var, varset; - int fh, i; -- char *fbdev = DEFAULTFBDEV; -+ char *fbdev = NULL; - char *modefile = DEFAULTFBMODE; - char *thisarg, *mode = NULL; - -@@ -404,7 +404,12 @@ - } - } - -+ if (fbdev == NULL) -+ fbdev = DEFAULTFBDEV; - if ((fh = open(fbdev, O_RDONLY)) < 0) -+#ifdef CONFIG_FEATURE_DEVFS -+ if ((fh = open("/dev/fb0", O_RDONLY)) < 0) -+#endif - bb_perror_msg_and_die("fbset(open)"); - if (ioctl(fh, FBIOGET_VSCREENINFO, &var)) - bb_perror_msg_and_die("fbset(ioctl)"); diff --git a/packages/busybox/busybox-1.00/gzip-spurious-const.patch b/packages/busybox/busybox-1.00/gzip-spurious-const.patch deleted file mode 100644 index 114a284e99..0000000000 --- a/packages/busybox/busybox-1.00/gzip-spurious-const.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- busybox-1.00/archival/gzip.c.old 2005-06-05 22:57:32.000000000 +0100 -+++ busybox-1.00/archival/gzip.c 2005-06-05 22:57:38.000000000 +0100 -@@ -2162,7 +2162,7 @@ - * Construct the Huffman tree for the bit lengths and return the index in - * bl_order of the last bit length code to send. - */ --static const int build_bl_tree() -+static int build_bl_tree() - { - int max_blindex; /* index of last bit length code of non zero freq */ - diff --git a/packages/busybox/busybox-1.00/hdparm_M.patch b/packages/busybox/busybox-1.00/hdparm_M.patch deleted file mode 100644 index 170906535e..0000000000 --- a/packages/busybox/busybox-1.00/hdparm_M.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -Naur busybox-1.00/miscutils/hdparm.c busybox-1.00-patched/miscutils/hdparm.c ---- busybox-1.00/miscutils/hdparm.c 2004-07-21 00:53:59.000000000 +0200 -+++ busybox-1.00-patched/miscutils/hdparm.c 2004-10-21 15:17:13.000000000 +0200 -@@ -1254,6 +1254,7 @@ - static unsigned long set_sleepnow = 0, get_sleepnow = 0; - static unsigned long get_powermode = 0; - static unsigned long set_apmmode = 0, get_apmmode= 0, apmmode = 0; -+static unsigned long set_acoustic = 0, get_acoustic = 0, acoustic = 0; - #endif - #ifdef CONFIG_FEATURE_HDPARM_GET_IDENTITY - static int get_IDentity = 0; -@@ -2123,6 +2124,20 @@ - } - bb_ioctl(fd, HDIO_DRIVE_CMD, &args,"HDIO_DRIVE_CMD"); - } -+ if (set_acoustic) -+ { -+ no_scsi(); -+ acoustic=check_if_min_and_set_val(acoustic,0); -+ acoustic=check_if_maj_and_set_val(acoustic,254); -+ if_printf(get_acoustic," setting AAM level to 0x%02lX (%ld)\n", acoustic, acoustic); -+ bb_ioctl(fd, HDIO_SET_ACOUSTIC, (int*)acoustic,"HDIO_SET_ACOUSTIC"); -+ } -+ if (get_acoustic) -+ { -+ no_scsi(); -+ bb_ioctl(fd, HDIO_GET_ACOUSTIC, (unsigned long*)&parm,"HDIO_GET_ACOUSTIC"); -+ printf(" acoustic = %2ld (128=quiet ... 254=fast)\n", parm); -+ } - if (set_wcache) - { - #ifdef DO_FLUSHCACHE -@@ -2831,6 +2846,13 @@ - p = *argv++, --argc; - p=GET_NUMBER(p,&set_readahead,&Xreadahead); - break; -+ case 'M': -+ get_acoustic = noisy; -+ noisy = 1; -+ if (!*p && argc && isalnum(**argv)) -+ p = *argv++, --argc; -+ p=GET_NUMBER(p,&set_acoustic,&acoustic); -+ break; - case 'B': - get_apmmode = noisy; - noisy = 1; - diff --git a/packages/busybox/busybox-1.00/ifupdown-spurious-environ.patch b/packages/busybox/busybox-1.00/ifupdown-spurious-environ.patch deleted file mode 100644 index 8753315f2c..0000000000 --- a/packages/busybox/busybox-1.00/ifupdown-spurious-environ.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- busybox-1.00/networking/ifupdown.c.old 2005-06-11 19:51:59.000000000 +0100 -+++ busybox-1.00/networking/ifupdown.c 2005-06-11 19:52:19.000000000 +0100 -@@ -148,6 +148,9 @@ - struct mapping_defn_t *mappings; - }; - -+/* XXX */ -+#define environ local_environ -+ - static char no_act = 0; - static char verbose = 0; - static char **environ = NULL; diff --git a/packages/busybox/busybox-1.00/iproute-flush-cache.patch b/packages/busybox/busybox-1.00/iproute-flush-cache.patch deleted file mode 100644 index f8becc3390..0000000000 --- a/packages/busybox/busybox-1.00/iproute-flush-cache.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: networking/libiproute/iproute.c -=================================================================== -RCS file: /var/cvs/busybox/networking/libiproute/iproute.c,v -retrieving revision 1.14 -diff -u -r1.14 iproute.c ---- networking/libiproute/iproute.c 11 Aug 2004 08:10:58 -0000 1.14 -+++ networking/libiproute/iproute.c 30 Nov 2004 20:43:44 -0000 -@@ -537,6 +537,15 @@ - } else if (matches(*argv, "match") == 0) { - NEXT_ARG(); - get_prefix(&filter.mdst, *argv, do_ipv6); -+ } else if (matches(*argv, "table") == 0) { -+ NEXT_ARG(); -+ if (matches(*argv, "cache") == 0) { -+ filter.tb = -1; -+ } else if (matches(*argv, "main") != 0) { -+ invarg("invalid \"table\"", *argv); -+ } -+ } else if (matches(*argv, "cache") == 0) { -+ filter.tb = -1; - } else { - if (matches(*argv, "exact") == 0) { - NEXT_ARG(); diff --git a/packages/busybox/busybox-1.00/linux-types.patch b/packages/busybox/busybox-1.00/linux-types.patch deleted file mode 100644 index e312073c9e..0000000000 --- a/packages/busybox/busybox-1.00/linux-types.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- busybox-1.00/libbb/loop.c.org 2006-09-19 18:18:17.084592997 +0200 -+++ busybox-1.00/libbb/loop.c 2006-09-19 18:18:09.820275793 +0200 -@@ -19,6 +19,7 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include - #include - #include - #include diff --git a/packages/busybox/busybox-1.00/mount-all-type.patch b/packages/busybox/busybox-1.00/mount-all-type.patch deleted file mode 100644 index 476094a804..0000000000 --- a/packages/busybox/busybox-1.00/mount-all-type.patch +++ /dev/null @@ -1,84 +0,0 @@ ---- busybox-1.00/.pc/mount-all-type.patch/util-linux/mount.c 2004-08-02 17:14:02.000000000 -0700 -+++ busybox-1.00/util-linux/mount.c 2005-05-13 00:17:19.054232796 -0700 -@@ -364,6 +364,56 @@ - exit(EXIT_SUCCESS); - } - -+/* Does this file system type, from /etc/fstab, match the given -+ * -t option value? -+ */ -+static int match_fs(const char *option, const char *type) -+{ -+ const int len = strlen(type); -+ const int no = option[0] == 'n' && option[1] == 'o'; -+ const char *optp = option; -+ -+ if (len > 0) do { -+ const char *match = strstr(optp, type); -+ -+ if (match == NULL) { -+ /* No match, but if the option string starts 'no' no match -+ * means yes. -+ */ -+ return no; -+ } -+ -+ /* Match, may be partial, check for end-of-type in option string. */ -+ if (match[len] == 0 || match[len] == ',') { -+ /* Ok, check for type or notype. */ -+ if (match == option) { -+ /* Exact match at start (can't be 'no') */ -+ return 1; -+ } -+ if (match > option+1) { -+ if (match[-1] == ',') { -+ /* Exact match in middle, might be 'no' */ -+ return !no; -+ } -+ if (match == option+2 && no) { -+ /* Exact match to 'notype' at start. */ -+ return 0; -+ } -+ if (match > option+2 && match[-3] == ',' && -+ match[-2] == 'n' && match[-1] == 'o') { -+ return 0; -+ } -+ } -+ } -+ -+ /* Look for another match. */ -+ optp = match+1; -+ } while (1); -+ -+ /* zero length type in fstab (impossible?), don't match it. */ -+ return 0; -+} -+ - extern int mount_main(int argc, char **argv) - { - struct stat statbuf; -@@ -371,6 +421,7 @@ - char *extra_opts; - int flags = 0; - char *filesystemType = "auto"; -+ char *filesystemOption = 0; - int got_filesystemType = 0; - char *device = xmalloc(PATH_MAX); - char *directory = xmalloc(PATH_MAX); -@@ -393,6 +444,7 @@ - break; - case 't': - filesystemType = optarg; -+ filesystemOption = optarg; - got_filesystemType = 1; - break; - case 'w': -@@ -460,6 +512,8 @@ - - strcpy(device, m->mnt_fsname); - strcpy(directory, m->mnt_dir); -+ if (all && filesystemOption != 0 && !match_fs(filesystemOption, m->mnt_type)) -+ continue; - filesystemType = bb_xstrdup(m->mnt_type); - singlemount: - extra_opts = string_flags; diff --git a/packages/busybox/busybox-1.00/nylon/.mtn2git_empty b/packages/busybox/busybox-1.00/nylon/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/busybox/busybox-1.00/nylon/defconfig b/packages/busybox/busybox-1.00/nylon/defconfig deleted file mode 100644 index 7efd042cdc..0000000000 --- a/packages/busybox/busybox-1.00/nylon/defconfig +++ /dev/null @@ -1,458 +0,0 @@ -# -# Automatically generated make config: don't edit -# -HAVE_DOT_CONFIG=y - -# -# General Configuration -# -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_FEATURE_VERBOSE_USAGE=y -# 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=y -CONFIG_FEATURE_SUID_CONFIG=y -CONFIG_FEATURE_SUID_CONFIG_QUIET=y -# CONFIG_SELINUX is not set - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_LFS is not set -# USING_CROSS_COMPILER is not set -EXTRA_CFLAGS_OPTIONS="" - -# -# Installation Options -# -# CONFIG_INSTALL_NO_USR is not set -PREFIX="./_install" - -# -# Archival Utilities -# -CONFIG_AR=y -CONFIG_FEATURE_AR_LONG_FILENAMES=y -CONFIG_BUNZIP2=y -CONFIG_CPIO=y -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set -CONFIG_GUNZIP=y -CONFIG_FEATURE_GUNZI