X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/9de7746a19132595b6b39561fba6a9ee5c2ad1a4..9d30652149fd745711342cec7ee8574e973ec241:/openwrt/package/busybox/busybox.mk?ds=sidebyside

diff --git a/openwrt/package/busybox/busybox.mk b/openwrt/package/busybox/busybox.mk
index e19aa7bc4..76de2548a 100644
--- a/openwrt/package/busybox/busybox.mk
+++ b/openwrt/package/busybox/busybox.mk
@@ -16,7 +16,7 @@ BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VER).tar.bz2
 BUSYBOX_SITE:=http://www.busybox.net/downloads
 endif
 BUSYBOX_UNZIP=bzcat
-BUSYBOX_CONFIG:=package/busybox/busybox.config
+BUSYBOX_CONFIG:=./busybox.config
 
 $(DL_DIR)/$(BUSYBOX_SOURCE):
 	 $(WGET) -P $(DL_DIR) $(BUSYBOX_SITE)/$(BUSYBOX_SOURCE)
@@ -26,19 +26,20 @@ busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE) $(BUSYBOX_CONFIG)
 $(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
 	$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 	# Allow busybox patches.
-	toolchain/patch-kernel.sh $(BUSYBOX_DIR) package/busybox/patches
+	$(PATCH) $(BUSYBOX_DIR) ./patches
 	touch $(BUSYBOX_DIR)/.unpacked
 
 $(BUSYBOX_DIR)/.configured: $(BUSYBOX_DIR)/.unpacked $(BUSYBOX_CONFIG)
-	cp $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/.config
-	$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\
-		PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak
-ifeq ($(BR2_LARGEFILE),y)
-	$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config
-else
-	$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config
-	$(SED) "s/^.*FDISK_SUPPORT_LARGE_DISKS.*/FDISK_SUPPORT_LARGE_DISKS=n/;" $(BUSYBOX_DIR)/.config
-endif
+	$(SCRIPT_DIR)/gen_busybox_config.pl $(TOPDIR)/.config > $(BUSYBOX_DIR)/.config
+#	cp $(BUSYBOX_CONFIG) $(BUSYBOX_DIR)/.config
+#	$(SED) "s,^CROSS.*,CROSS=$(TARGET_CROSS)\n\
+#		PREFIX=$(TARGET_DIR),;" $(BUSYBOX_DIR)/Rules.mak
+#ifeq ($(BR2_LARGEFILE),y)
+#	$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=y/;" $(BUSYBOX_DIR)/.config
+#else
+#	$(SED) "s/^.*CONFIG_LFS.*/CONFIG_LFS=n/;" $(BUSYBOX_DIR)/.config
+#	$(SED) "s/^.*FDISK_SUPPORT_LARGE_DISKS.*/FDISK_SUPPORT_LARGE_DISKS=n/;" $(BUSYBOX_DIR)/.config
+#endif
 	$(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" -C $(BUSYBOX_DIR) oldconfig
 	touch $(BUSYBOX_DIR)/.configured
 
@@ -49,10 +50,11 @@ $(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.configured
 $(TARGET_DIR)/bin/busybox: $(BUSYBOX_DIR)/busybox
 	$(MAKE) CC=$(TARGET_CC) CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
 		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) install
+	$(STRIP) $(TARGET_DIR)/bin/busybox
 	# Just in case
 	-chmod a+x $(TARGET_DIR)/usr/share/udhcpc/default.script
 
-busybox: uclibc $(TARGET_DIR)/bin/busybox
+busybox: $(TARGET_DIR)/bin/busybox
 
 busybox-clean:
 	rm -f $(TARGET_DIR)/bin/busybox
@@ -60,12 +62,3 @@ busybox-clean:
 
 busybox-dirclean:
 	rm -rf $(BUSYBOX_DIR)
-
-#############################################################
-#
-# Toplevel Makefile options
-#
-#############################################################
-ifeq ($(strip $(BR2_PACKAGE_BUSYBOX)),y)
-TARGETS+=busybox
-endif