sstrip, nas support, mppe support, mac os x patches, syslogd on bootup, inittab correction

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@136 3c298f89-4303-0410-b956-a3cf2f4a3e73

7 files changed, 19 insertions, 15 deletions

diff --git a/obsolete-buildroot/make/binutils-uclibc.mk b/obsolete-buildroot/make/binutils-uclibc.mk
index ae2e5284b..aec830c61 100644
--- a/obsolete-buildroot/make/binutils-uclibc.mk
+++ b/obsolete-buildroot/make/binutils-uclibc.mk
@@ -46,15 +46,15 @@ $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin/ld: $(BINUTILS_DIR1)/binutils/objdump
 	$(MAKE) $(JLEVEL) -C $(BINUTILS_DIR1) install
 
 binutils-dependancies:
-	@if [ ! -x /usr/bin/bison ] ; then \
+	@if [ -z "`which bison`" ] ; then \
 		echo -e "\n\nYou must install 'bison' on your build machine\n"; \
 		exit 1; \
 	fi;
-	@if [ ! -x /usr/bin/flex ] ; then \
+	@if [ -z "`which flex`" ] ; then \
 		echo -e "\n\nYou must install 'flex' on your build machine\n"; \
 		exit 1; \
 	fi;
-	@if [ ! -x /usr/bin/msgfmt ] ; then \
+	@if [ -z "`which msgfmt`" ] ; then \
 		echo -e "\n\nYou must install 'gettext' on your build machine\n"; \
 		exit 1; \
 	fi;
diff --git a/obsolete-buildroot/make/ipkg-utils.mk b/obsolete-buildroot/make/ipkg-utils.mk
index 478f29cf2..b6f943e47 100644
--- a/obsolete-buildroot/make/ipkg-utils.mk
+++ b/obsolete-buildroot/make/ipkg-utils.mk
@@ -37,5 +37,6 @@ ipkg-utils-dirclean:
 
 
 IPKG_BUILDPACKAGE := PATH=$(TARGET_PATH) ipkg-buildpackage -c -o root -g root
+IPKG_BUILD := PATH=$(TARGET_PATH) ipkg-build -c -o root -g root
 IPKG_MAKE_INDEX := PATH=$(TARGET_PATH) ipkg-make-index
 
diff --git a/obsolete-buildroot/make/openssh.mk b/obsolete-buildroot/make/openssh.mk
index fb207b200..0182f5776 100644
--- a/obsolete-buildroot/make/openssh.mk
+++ b/obsolete-buildroot/make/openssh.mk
@@ -108,7 +108,7 @@ $(OPENSSH_SERVER_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
 	cp $(OPENSSH_IPK_BUILD_DIR)/usr/sbin/sshd $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
 	mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
 	cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh-keygen $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build
 	rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
 
 $(OPENSSH_CLIENT_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
@@ -123,7 +123,7 @@ $(OPENSSH_CLIENT_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
 	mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
 	cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
 	cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/scp $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build
 	rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
 
 $(OPENSSH_SFTP_SERVER_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
@@ -132,7 +132,7 @@ $(OPENSSH_SFTP_SERVER_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
 	cp $(OPENSSH_IPK_DIR)/openssh.sftp-server.control $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/control
 	mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
 	cp $(OPENSSH_IPK_BUILD_DIR)/usr/sbin/sftp-server $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build
 	rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
 
 $(OPENSSH_SFTP_CLIENT_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
@@ -141,7 +141,7 @@ $(OPENSSH_SFTP_CLIENT_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
 	cp $(OPENSSH_IPK_DIR)/openssh.sftp-client.control $(OPENSSH_IPK_BUILD_DIR)/build/CONTROL/control
 	mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
 	cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/sftp $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build
 	rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
 
 $(OPENSSH_CLIENT_EX_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
@@ -154,7 +154,7 @@ $(OPENSSH_CLIENT_EX_IPK): $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh
 	cp $(OPENSSH_IPK_BUILD_DIR)/usr/bin/ssh-keyscan $(OPENSSH_IPK_BUILD_DIR)/build/usr/bin
 	mkdir -p $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
 	cp $(OPENSSH_IPK_BUILD_DIR)/usr/sbin/ssh-keysign $(OPENSSH_IPK_BUILD_DIR)/build/usr/sbin
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSH_IPK_BUILD_DIR)/build
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSH_IPK_BUILD_DIR)/build
 	rm -rf $(OPENSSH_IPK_BUILD_DIR)/build
 
 openssh-ipk: $(OPENSSH_SERVER_IPK) $(OPENSSH_CLIENT_IPK) \
diff --git a/obsolete-buildroot/make/openssl.mk b/obsolete-buildroot/make/openssl.mk
index 8366e8cf2..d9bb477ed 100644
--- a/obsolete-buildroot/make/openssl.mk
+++ b/obsolete-buildroot/make/openssl.mk
@@ -77,7 +77,7 @@ $(LIBSSL_IPK): uclibc $(STAGING_DIR)/lib/libcrypto.a
 	cp -fa $(STAGING_DIR)/lib/libssl.so* $(OPENSSL_IPK_BUILD_DIR)/usr/lib/
 	-$(STRIP) --strip-unneeded $(OPENSSL_IPK_BUILD_DIR)/usr/lib/libssl.so.0.9.7
 	-$(STRIP) --strip-unneeded $(OPENSSL_IPK_BUILD_DIR)/usr/lib/libcrypto.so.0.9.7
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(OPENSSL_IPK_BUILD_DIR)
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(OPENSSL_IPK_BUILD_DIR)
 
 openssl-ipk: $(LIBSSL_IPK)
 
diff --git a/obsolete-buildroot/make/openwrt.mk b/obsolete-buildroot/make/openwrt.mk
index 5867046a7..c7bb8fc03 100644
--- a/obsolete-buildroot/make/openwrt.mk
+++ b/obsolete-buildroot/make/openwrt.mk
@@ -49,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
@@ -76,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
 
@@ -202,8 +202,8 @@ openwrt-rootprep:
 
 ######################################################################
 
-openwrt-prune: openwrt-base
-	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+openwrt-prune: $(STAGING_DIR)/bin/sstrip openwrt-base
+	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STAGING_DIR)/bin/sstrip 2>/dev/null || true;
 	# remove unneeded uClibc libs
 	rm -rf $(TARGET_DIR)/lib/libthread_db*
 	rm -rf $(TARGET_DIR)/lib/libpthread*
@@ -217,6 +217,9 @@ openwrt-prune: openwrt-base
 
 ######################################################################
 
+$(STAGING_DIR)/bin/sstrip:
+	$(CC) -o $(STAGING_DIR)/bin/sstrip -I$(STAGING_DIR)/mipsel-linux-uclibc/include $(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
diff --git a/obsolete-buildroot/make/pppoecd.mk b/obsolete-buildroot/make/pppoecd.mk
index 3e7c2b319..734fe7f50 100644
--- a/obsolete-buildroot/make/pppoecd.mk
+++ b/obsolete-buildroot/make/pppoecd.mk
@@ -47,7 +47,7 @@ $(PPPOECD_IPK_BUILD_DIR)/CONTROL/control:
 	
 # build the ipk package
 $(PPPOECD_PACKAGE): $(PPPOECD_IPK_BIN) $(PPPOECD_IPK_BUILD_DIR)/CONTROL/control
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(PPPOECD_IPK_BUILD_DIR)
+	cd $(BUILD_DIR); $(IPKG_BUILD) $(PPPOECD_IPK_BUILD_DIR)
 
 # main target for building the ipk version
 pppoecd-ipk: $(PPPOECD_PACKAGE)
diff --git a/obsolete-buildroot/make/zlib.mk b/obsolete-buildroot/make/zlib.mk
index 48e7b3256..d6004ed08 100644
--- a/obsolete-buildroot/make/zlib.mk
+++ b/obsolete-buildroot/make/zlib.mk
@@ -71,7 +71,7 @@ $(ZLIB_IPK): uclibc $(STAGING_DIR)/lib/libz.so.1.1.4
 	cp -dpf $(STAGING_DIR)/lib/libz.so* $(ZLIB_IPK_DIR)/lib;
 	-$(STRIP) --strip-unneeded $(ZLIB_IPK_DIR)/lib/libz.so*
 	touch -c $(ZLIB_IPK_DIR)/lib/libz.so.1.1.4
-	cd $(BUILD_DIR); $(STAGING_DIR)/bin/ipkg-build -c -o root -g root $(ZLIB_IPK_DIR)
+	cd $(ZLIB_IPK_DIR) $(IPKG_BUILDPACKAGE)
 
 zlib-ipk: $(ZLIB_IPK)