Habe IPFire auf LFS 6.2 gebracht.

[people/pmueller/ipfire-2.x.git] / lfs / util-linux

diff --git a/lfs/util-linux b/lfs/util-linux
index 924b21461bc17568d045a2c937e03d8b4d829ca5..411316b6678a6f0f8cf6a102905975893e9a5f3e 100644 (file)
--- a/lfs/util-linux
+++ b/lfs/util-linux
@@ -18,12 +18,6 @@
 # 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: util-linux,v 1.8.2.7 2006/01/20 14:31:47 franck78 Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -36,17 +30,13 @@ VER        = 2.12r
 
 THISAPP    = util-linux-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_KERNEL)/linux/utils/util-linux
+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
@@ -60,6 +50,7 @@ objects = $(DL_FILE)
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 $(DL_FILE)_MD5 = af9d9e03038481fbf79ea3ac33f116f9
+
 install : $(TARGET)
 
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -89,35 +80,19 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 ifeq "$(ROOT)" ""
-ifeq "$(LFS_PASS)" "install"
-       -mkdir -p /install/misc/bin
-       cd $(DIR_APP) && CFLAGS="-Os -fomit-frame-pointer" ./configure
-       cd $(DIR_APP)/fdisk && sed -i 's+setlocale+// setlocale+' sfdisk.c
-       cd $(DIR_APP)/fdisk && make sfdisk
-       cd $(DIR_APP)/fdisk && install -m 0755 sfdisk /install/misc/bin
-       if [ "$(MACHINE)" = "alpha" ]; then \
-               cd $(DIR_APP)/fdisk && make fdisk; \
-               cd $(DIR_APP)/fdisk && install -m 0755 fdisk /install/misc/bin; \
-       fi
-else
-       cd $(DIR_APP) && cp hwclock/hwclock.c{,.backup}
-       cd $(DIR_APP) && sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \
-           hwclock/hwclock.c.backup > hwclock/hwclock.c
+       cd $(DIR_APP) && sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
+                               hwclock/hwclock.c
        -mkdir -p /var/lib/hwclock
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-cramfs-1.patch
        cd $(DIR_APP) && ./configure
-       cd $(DIR_APP) && make HAVE_SLN=yes
-       cd $(DIR_APP) && make HAVE_SLN=yes install
-       chmod u-s /bin/mount /bin/umount
-       touch /var/lib/hwclock/adjtime
-endif
+       cd $(DIR_APP) && make $(MAKETUNING) HAVE_KILL=yes HAVE_SLN=yes
+       cd $(DIR_APP) && make HAVE_KILL=yes HAVE_SLN=yes install
 else
-       cd $(DIR_APP) && cp configure configure.backup
-       cd $(DIR_APP) && sed "s@/usr/include@/tools/include@g" configure.backup > configure 
-       cd $(DIR_APP) && chmod 755 configure
+       cd $(DIR_APP) && sed -i 's@/usr/include@/tools/include@g' configure
        cd $(DIR_APP) && ./configure
-       cd $(DIR_APP) && make -C lib
-       cd $(DIR_APP) && make -C mount mount umount
-       cd $(DIR_APP) && make -C text-utils more
+       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)