X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fbusybox;h=cdea9ef8c0d55214a654e243a0567426ec113d0b;hp=7df7c6196d6b60216d74ca10420349c26479c4cf;hb=f55e2865db62bb654a91943abd8016db2b7fd613;hpb=34f003a1264a2b1b1371eb31d6be5f3eaeaebe54

diff --git a/lfs/busybox b/lfs/busybox
index 7df7c6196d..cdea9ef8c0 100644
--- a/lfs/busybox
+++ b/lfs/busybox
@@ -1,29 +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>                        #
-#                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: busybox,v 1.11.2.5 2005/06/22 20:00:56 rkerr Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -33,12 +24,11 @@
 
 include Config
 
-VER        = 0.60.5
+VER        = 1.2.2
 
 THISAPP    = busybox-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-#DL_FROM    = http://www.busybox.net/downloads
-DL_FROM	   = http://ipcop.ath.cx
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
@@ -50,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 1dfe09e0b1db1aab2a5f7d03e47640a6
+$(DL_FILE)_MD5 = ae8a4c65b9464c8ece3483a3d3b9544c
 
 install : $(TARGET)
 
@@ -79,33 +69,15 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/busybox-0.60.5-config.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/busybox-0.60.5-gzip.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/busybox-0.60.5-spider.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/busybox-0.60.5-insmod_gpl_symbols.patch
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/busybox-0.60.5-wget-unlink.patch
-	if [ "$(MACHINE)" = "alpha" ]; then \
-		cd $(DIR_APP) && sed -i -e 's/#define BB_INSMOD//' Config.h; \
-		cd $(DIR_APP) && sed -i -e 's/#define BB_RMMOD//' Config.h; \
-		cd $(DIR_APP) && sed -i -e 's/#define BB_MODPROBE//' Config.h; \
-	fi
-	cd $(DIR_APP) && sed -i -e 's/enum { NAME_SIZE = 100 };/enum { NAME_SIZE = 150 };/' tar.c; \
-	
-	cd $(DIR_APP) && make
-	-mkdir -p /install/initrd/bin
-	cd $(DIR_APP) && install -m 0755 busybox /install/initrd/bin
-	cd /install/initrd/bin && for i in [ ash cat chroot dd df echo gzip \
-	    gunzip halt insmod ifconfig init ls mkswap modprobe mount reboot \
-	    rmmod sed sh sleep swapon swapoff syslogd tar umount wget ping \
-	    sync; do \
-	        ln -sf busybox $$i; \
-	    done
-	if [ "$(MACHINE)" = "alpha" ]; then \
-		cd /install/initrd/bin && rm -f rmmod modprobe insmod; \
-		cp /sbin/insmod.static /install/initrd/bin/insmod; \
-		cd /install/initrd/bin && ln -s insmod modprobe; \
-		cd /install/initrd/bin && ln -s insmod rmmod; \
-	fi
-	@rm -rf $(DIR_APP)
+	@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 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
+	ln -svf /tmp/resolv.conf /install/initrd/etc/resolv.conf
+	@rm -rf $(DIR_APP) /install/initrd/linuxrc
 	@$(POSTBUILD)