X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Futil-linux;h=a39416601dc95d633a078e03e1446e8b6da3a34b;hb=71ce1f7a0e85cd00097acb3d68ff57ac1e5f60ee;hp=3dac54d8692e40f075ceb19adcc29761d703b5cd;hpb=0112049091968980d753afdef4518f254f140a23;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/util-linux b/lfs/util-linux
index 3dac54d86..a39416601 100644
--- a/lfs/util-linux
+++ b/lfs/util-linux
@@ -30,18 +30,7 @@ THISAPP    = util-linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-
-# Normal build or /tools build.
-#
-ifeq "$(ROOT)" ""
-ifeq "$(LFS_PASS)" "install"
-  TARGET = $(DIR_INFO)/$(THISAPP)-install
-else
-  TARGET = $(DIR_INFO)/$(THISAPP)
-endif
-else
-  TARGET = $(DIR_INFO)/$(THISAPP)-tools
-endif
+TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
@@ -82,16 +71,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/util-linux-2.12r-umount-no-special.patch
-ifeq "$(ROOT)" ""
-ifeq "$(LFS_PASS)" "install"
-	cd $(DIR_APP) && CFLAGS="-Os -fomit-frame-pointer" ./configure
-	cd $(DIR_APP) && echo "HAVE_SLANG=yes" >> make_include
-	cd $(DIR_APP) && echo "SLANGFLAGS=-I/opt/$(MACHINE)-uClibc/include" >> make_include
-	cd $(DIR_APP)/fdisk && make cfdisk
-	cd $(DIR_APP)/fdisk && make sfdisk
-	cd $(DIR_APP)/fdisk && install -m 0755 cfdisk /install/initrd/bin
-	cd $(DIR_APP)/fdisk && install -m 0755 sfdisk /install/initrd/bin
-else
 	cd $(DIR_APP) && sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
 				hwclock/hwclock.c
 	-mkdir -p /var/lib/hwclock
@@ -100,14 +79,5 @@ else
 	cd $(DIR_APP) && ./configure
 	cd $(DIR_APP) && make $(MAKETUNING) HAVE_KILL=yes HAVE_SLN=yes
 	cd $(DIR_APP) && make HAVE_KILL=yes HAVE_SLN=yes install
-endif
-else
-	cd $(DIR_APP) && sed -i 's@/usr/include@/tools/include@g' configure
-	cd $(DIR_APP) && ./configure
-	cd $(DIR_APP) && make $(MAKETUNING) -C lib
-	cd $(DIR_APP) && make $(MAKETUNING) -C mount mount umount
-	cd $(DIR_APP) && make $(MAKETUNING) -C text-utils more
-	cd $(DIR_APP) && cp mount/{,u}mount text-utils/more /tools/bin
-endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)