diff options
| -rw-r--r-- | make/busybox.mk | 10 | ||||
| -rw-r--r-- | sources/busybox.patch | 201 |
2 files changed, 8 insertions, 203 deletions
diff --git a/make/busybox.mk b/make/busybox.mk index 36c0c41fc..f12fa5bc7 100644 --- a/make/busybox.mk +++ b/make/busybox.mk @@ -23,18 +23,24 @@ $(DL_DIR)/$(BUSYBOX_SOURCE): busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_PATCH) -$(BUSYBOX_DIR)/Config.h: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_PATCH) +$(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_PATCH) $(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) -xvf - + touch $(BUSYBOX_DIR)/.unpacked + +$(BUSYBOX_DIR)/.patched: $(BUSYBOX_DIR)/.unpacked cat $(BUSYBOX_PATCH) | patch -d $(BUSYBOX_DIR) -p1 ifeq ($(strip $(BUILD_WITH_LARGEFILE)),true) perl -i -p -e "s/^DOLFS.*/DOLFS=true/;" $(BUSYBOX_DIR)/Makefile endif + touch $(BUSYBOX_DIR)/.patched -$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/Config.h +$(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.patched make CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" -C $(BUSYBOX_DIR) + touch $(BUSYBOX_DIR)/busybox $(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox make CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" -C $(BUSYBOX_DIR) install + cp -a $(BUSYBOX_DIR)/busybox $(TARGET_DIR)/bin/busybox busybox: uclibc $(TARGET_DIR)/bin/busybox diff --git a/sources/busybox.patch b/sources/busybox.patch index 66986bad5..e69de29bb 100644 --- a/sources/busybox.patch +++ b/sources/busybox.patch @@ -1,201 +0,0 @@ ---- busybox/Config.h 6 Apr 2002 04:22:15 -0000 1.116 -+++ busybox/Config.h 26 Apr 2002 21:58:07 -0000 -@@ -18,9 +18,9 @@ - #define BB_CHROOT - #define BB_CHVT - #define BB_CLEAR --//#define BB_CMP -+#define BB_CMP - #define BB_CP --//#define BB_CPIO -+#define BB_CPIO - #define BB_CUT - #define BB_DATE - //#define BB_DC -@@ -29,7 +29,7 @@ - #define BB_DF - #define BB_DIRNAME - #define BB_DMESG --//#define BB_DOS2UNIX -+#define BB_DOS2UNIX - //#define BB_DPKG - //#define BB_DPKG_DEB - //#define BB_DUTMP -@@ -37,7 +37,7 @@ - //#define BB_DUMPKMAP - #define BB_ECHO - #define BB_ENV --//#define BB_EXPR -+#define BB_EXPR - //#define BB_FBSET - //#define BB_FDFLUSH - #define BB_FIND -@@ -51,12 +51,12 @@ - #define BB_HALT - #define BB_HEAD - //#define BB_HOSTID --//#define BB_HOSTNAME -+#define BB_HOSTNAME - //#define BB_HUSH - #define BB_ID --//#define BB_IFCONFIG -+#define BB_IFCONFIG - #define BB_INIT --//#define BB_INSMOD -+#define BB_INSMOD - #define BB_KILL - #define BB_KILLALL - #define BB_KLOGD -@@ -72,7 +72,7 @@ - #define BB_LS - #define BB_LSMOD - //#define BB_MAKEDEVS --//#define BB_MD5SUM -+#define BB_MD5SUM - #define BB_MKDIR - //#define BB_MKFIFO - //#define BB_MKFS_MINIX -@@ -85,58 +85,58 @@ - //#define BB_MSH - //#define BB_MT - #define BB_MV --//#define BB_NC --//#define BB_NSLOOKUP -+#define BB_NC -+#define BB_NSLOOKUP - #define BB_PIDOF --//#define BB_PING --//#define BB_PIVOT_ROOT -+#define BB_PING -+#define BB_PIVOT_ROOT - #define BB_POWEROFF - //#define BB_PRINTF - #define BB_PS - #define BB_PWD - //#define BB_RDATE --//#define BB_READLINK -+#define BB_READLINK - #define BB_REBOOT - //#define BB_RENICE - #define BB_RESET - #define BB_RM - #define BB_RMDIR --//#define BB_RMMOD --//#define BB_ROUTE -+#define BB_RMMOD -+#define BB_ROUTE - //#define BB_RPM2CPIO - #define BB_SED - //#define BB_SETKEYCODES - #define BB_SLEEP - #define BB_SORT - //#define BB_STTY --#define BB_SWAPONOFF -+//#define BB_SWAPONOFF - #define BB_SYNC - #define BB_SYSLOGD - #define BB_TAIL - #define BB_TAR --//#define BB_TEE --//#define BB_TEST --//#define BB_TELNET -+#define BB_TEE -+#define BB_TEST -+#define BB_TELNET - //#define BB_TFTP --//#define BB_TIME -+#define BB_TIME - #define BB_TOUCH --//#define BB_TR --//#define BB_TRACEROUTE -+#define BB_TR -+#define BB_TRACEROUTE - #define BB_TRUE_FALSE - #define BB_TTY --//#define BB_UNIX2DOS -+#define BB_UNIX2DOS - //#define BB_UUENCODE - //#define BB_UUDECODE - #define BB_UMOUNT - #define BB_UNIQ - #define BB_UNAME --//#define BB_UPDATE -+#define BB_UPDATE - #define BB_UPTIME - //#define BB_USLEEP --//#define BB_VI -+#define BB_VI - //#define BB_WATCHDOG - #define BB_WC --//#define BB_WGET -+#define BB_WGET - #define BB_WHICH - #define BB_WHOAMI - #define BB_XARGS -@@ -217,16 +217,16 @@ - #define BB_FEATURE_USE_INITTAB - // - //Enable init being called as /linuxrc --#define BB_FEATURE_LINUXRC -+//#define BB_FEATURE_LINUXRC - // - //Have init enable core dumping for child processes (for debugging only) - //#define BB_FEATURE_INIT_COREDUMPS - // - //Make sure nothing is printed to the console on boot --//#define BB_FEATURE_EXTRA_QUIET -+#define BB_FEATURE_EXTRA_QUIET - // - // enable syslogd -R remotehost --#define BB_FEATURE_REMOTE_LOG -+//#define BB_FEATURE_REMOTE_LOG - // - // enable syslogd -C - //#define BB_FEATURE_IPC_SYSLOG -@@ -308,13 +308,13 @@ - #define BB_FEATURE_ASH_JOB_CONTROL - // - //Turn on extra fbset options --//#define BB_FEATURE_FBSET_FANCY -+#define BB_FEATURE_FBSET_FANCY - // - //Turn on fbset readmode support --//#define BB_FEATURE_FBSET_READMODE -+#define BB_FEATURE_FBSET_READMODE - // - // Support insmod/lsmod/rmmod for post 2.1 kernels --//#define BB_FEATURE_NEW_MODULE_INTERFACE -+#define BB_FEATURE_NEW_MODULE_INTERFACE - // - // Support insmod/lsmod/rmmod for pre 2.1 kernels - //#define BB_FEATURE_OLD_MODULE_INTERFACE -@@ -332,16 +332,16 @@ - //#define BB_FEATURE_MINIX2 - // - // Enable ifconfig status reporting output -- this feature adds 7k. --//#define BB_FEATURE_IFCONFIG_STATUS -+#define BB_FEATURE_IFCONFIG_STATUS - // - // Enable ifconfig slip-specific options "keepalive" and "outfill" --//#define BB_FEATURE_IFCONFIG_SLIP -+#define BB_FEATURE_IFCONFIG_SLIP - // - // Enable ifconfig options "mem_start", "io_addr", and "irq". --//#define BB_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ -+#define BB_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ - // - // Enable ifconfig option "hw". Currently works for only with "ether". --//#define BB_FEATURE_IFCONFIG_HW -+#define BB_FEATURE_IFCONFIG_HW - // - // Allows "broadcast +" to set broadcast automatically based on hostaddr - // and netmask, at a cost of about 100 bytes of code (i386). -@@ -379,7 +379,7 @@ - #define BB_FEATURE_FIND_NEWER - // - // Support for the -A -B and -C context flags in grep --//#define BB_FEATURE_GREP_CONTEXT -+#define BB_FEATURE_GREP_CONTEXT - // - // Support for the EGREP applet (alias to the grep applet) - //#define BB_FEATURE_GREP_EGREP_ALIAS |