X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fbusybox;h=cdea9ef8c0d55214a654e243a0567426ec113d0b;hb=be24d6b32f46f97242da308c5c625c0f34d8ff3b;hp=6a6ed0833001038e51f5fd79f6144ff0a52f807a;hpb=d50b88e8bbf85993091707571aa243eac16525e4;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/busybox b/lfs/busybox
index 6a6ed08330..cdea9ef8c0 100644
--- a/lfs/busybox
+++ b/lfs/busybox
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -72,20 +70,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	-mkdir -p /install/initrd/{{,s}bin,etc}
 	cd $(DIR_APP) && cp -f $(DIR_SRC)/config/uClibc/busybox.config .config
-	cd $(DIR_APP) && make
-	-mkdir -p /install/initrd/bin
-	cd $(DIR_APP) && install -m 0755 busybox /install/initrd/bin
+	cd $(DIR_APP) && make oldconfig
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make install
 	mkdir -p /install/initrd/usr/share/udhcpc
 	cd $(DIR_APP) && install -m 0755 examples/udhcp/simple.script \
 		/install/initrd/usr/share/udhcpc/default.script
-	cd /install/initrd/bin && for i in [ ash basename cat chroot cp \
-		date dd df dmesg echo gzip gunzip halt hwclock insmod ifconfig \
-		init ls ln mkdir mkswap modprobe mount reboot rmmod lsmod \
-		e2label mke2fs mkfs.minix tftp \
-		sed sh sleep swapon swapoff syslogd tar umount wget env \
-		ping sync udhcpc grep xargs route test uname wc readlink; do \
-			ln -sf busybox $$i; \
-		done
-	@rm -rf $(DIR_APP)
+	ln -svf /tmp/resolv.conf /install/initrd/etc/resolv.conf
+	@rm -rf $(DIR_APP) /install/initrd/linuxrc
 	@$(POSTBUILD)