Removed unzip and uClibc from the system.

[people/ms/ipfire-3.x.git] / lfs / busybox

diff --git a/lfs/busybox b/lfs/busybox
index 491de505e2b235cd22a256f1a4c8c01b66be2692..88e794675f1f23c2b74c8c7824eb996344f51c27 100644 (file)
--- a/lfs/busybox
+++ b/lfs/busybox
@@ -24,13 +24,14 @@
 
 include Config
 
-VER        = 1.2.2
+PKG_NAME   = busybox
+VER        = 1.8.2
 
-THISAPP    = busybox-$(VER)
+THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+
+TARGET     = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -38,31 +39,13 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 
 objects = $(DL_FILE)
 
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = ae8a4c65b9464c8ece3483a3d3b9544c
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+install: $(TARGET)
 
 download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
-
 $(patsubst %,$(DIR_DL)/%,$(objects)) :
        @$(LOAD)
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
-
 ###############################################################################
 # Installation Details
 ###############################################################################
@@ -70,14 +53,11 @@ $(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) && cp -f $(DIR_CONFIG)/$(PKG_NAME)/.config .config
        cd $(DIR_APP) && make oldconfig
-       cd $(DIR_APP) && make
+       cd $(DIR_APP) && make -j $(PARALLELISM)
        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
+       rm -vf $(INSTALLER_DIR)/linuxrc
+       cp -vf $(DIR_CONF)/busybox/default.script $(INSTALLER_DIR)/usr/share/udhcpc/
+       @rm -rf $(DIR_APP)
        @$(POSTBUILD)