X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1dfdb01703ee80d615586a72d3e8de29d5c9c97e..e0605febc2da7f48c76861dbbee42a0429044dd6:/obsolete-buildroot/make/openwrt.mk

diff --git a/obsolete-buildroot/make/openwrt.mk b/obsolete-buildroot/make/openwrt.mk
index e839a0a5c..6b77c2c56 100644
--- a/obsolete-buildroot/make/openwrt.mk
+++ b/obsolete-buildroot/make/openwrt.mk
@@ -23,7 +23,7 @@
 # Currently the dependencies are not all handled.  But that's true of
 # our buildroot in general, since it wasn't really set up for end users.
 
-OPENWRT_TARGETS:= openwrt-linux openwrt-kmodules.tar.bz2 \
+OPENWRT_TARGETS:= $(STAGING_DIR)/bin/sstrip gcc3_3 openwrt-linux openwrt-kmodules.tar.bz2 \
 	openwrt-shared openwrt-mtd openwrt-nvram openwrt-wlconf \
 	bridge dnsmasq1 iptables wtools busybox \
 	openwrt-rootprep
@@ -34,8 +34,6 @@ openwrt-base: $(OPENWRT_TARGETS)
 
 ######################################################################
 
-ifneq ($(filter $(TARGETS),openwrt-base),)
-
 WRT54G_SOURCE=wrt54gs.2.07.1.tgz
 WRT54G_SITE=http://www.linksys.com/support/opensourcecode/wrt54gs/2.07.1
 WRT54G_DIR=$(BUILD_DIR)/WRT54GS
@@ -51,7 +49,7 @@ $(LINUX_DIR)/.unpacked: $(WRT54G_DIR)/.prepared
 	touch $(LINUX_DIR)/.unpacked
 
 $(LINUX_DIR)/.patched: $(WRT54G_DIR)/.prepared
-	$(SOURCE_DIR)/patch-kernel.sh $(LINUX_DIR)/../.. $(SOURCE_DIR)/openwrt/kernel/patches
+	$(SOURCE_DIR)/patch-kernel.sh $(LINUX_DIR) $(SOURCE_DIR)/openwrt/kernel/patches
 	# use replacement diag module code
 	cp -f $(SOURCE_DIR)/openwrt/kernel/diag.c $(LINUX_DIR)/drivers/net/diag/diag_led.c
 	cp -f $(SOURCE_DIR)/openwrt/kernel/linux.config $(LINUX_DIR)/.config
@@ -62,7 +60,7 @@ $(LINUX_DIR)/.patched: $(WRT54G_DIR)/.prepared
 	)
 	touch $(LINUX_DIR)/.patched
 
-$(LINUX_DIR)/.configured: $(LINUX_DIR)/.patched $(LINUX_DIR)/.bbc-patched $(LINUX_DIR)/.nf-patched 
+$(LINUX_DIR)/.configured: $(LINUX_DIR)/.nf-patched $(LINUX_DIR)/.patched $(LINUX_DIR)/.bbc-patched
 	$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/Makefile
 	$(SED) "s,^CROSS_COMPILE.*,CROSS_COMPILE=$(KERNEL_CROSS),g;" $(LINUX_DIR)/arch/mips/Makefile
 	$(SED) "s,\-mcpu=,\-mtune=,g;" $(LINUX_DIR)/arch/mips/Makefile
@@ -78,7 +76,7 @@ $(LINUX_DIR)/$(LINUX_BINLOC): $(LINUX_DIR)/.depend_done
 
 openwrt-kmodules.tar.bz2: $(LINUX_DIR)/$(LINUX_BINLOC)
 	$(MAKE) -C $(LINUX_DIR) modules
-	$(MAKE) -C $(LINUX_DIR) DEPMOD=/bin/true \
+	$(MAKE) -C $(LINUX_DIR) DEPMOD=true \
 		INSTALL_MOD_PATH=$(LINUX_DIR)/modules modules_install
 	tar -C $(LINUX_DIR)/modules/lib -cjf openwrt-kmodules.tar.bz2 modules
 
@@ -204,8 +202,7 @@ openwrt-rootprep:
 
 ######################################################################
 
-openwrt-prune: 
-	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+openwrt-prune: openwrt-base
 	# remove unneeded uClibc libs
 	rm -rf $(TARGET_DIR)/lib/libthread_db*
 	rm -rf $(TARGET_DIR)/lib/libpthread*
@@ -216,9 +213,14 @@ openwrt-prune:
 	rm -f $(TARGET_DIR)/usr/sbin/iptables-save
 	rm -f $(TARGET_DIR)/usr/sbin/iptables-restore
 	rm -f $(TARGET_DIR)/usr/sbin/ip6tables
+	rm -f $(TARGET_DIR)/usr/lib/iptables/libip6*
+	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STAGING_DIR)/bin/sstrip 2>/dev/null || true;
 
 ######################################################################
 
+$(STAGING_DIR)/bin/sstrip:
+	$(CC) -o $(STAGING_DIR)/bin/sstrip $(SOURCE_DIR)/openwrt/tools/sstrip.c
+
 wrt-tools:
 	$(CC) -o $(WRT54G_DIR)/release/tools/trx $(SOURCE_DIR)/openwrt/tools/trx.c
 	$(CC) -o $(WRT54G_DIR)/release/tools/addpattern $(SOURCE_DIR)/openwrt/tools/addpattern.c
@@ -237,4 +239,3 @@ openwrt-g-code.bin: openwrt-gs-code.bin
 openwrt-code.bin: openwrt-gs-code.bin openwrt-g-code.bin
 
 ######################################################################
-endif