X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Futil-linux;h=b5038801af98bbf5615d0f88d9196d8e7d5fa116;hb=e2b8b617a724a1ca0d032e4ffff01ed67002e0ba;hp=924b21461bc17568d045a2c937e03d8b4d829ca5;hpb=cd1a2927226c734d96478e12bb768256fb64a06a;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/util-linux b/lfs/util-linux
index 924b21461b..b5038801af 100644
--- a/lfs/util-linux
+++ b/lfs/util-linux
@@ -1,28 +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: util-linux,v 1.8.2.7 2006/01/20 14:31:47 franck78 Exp $
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -36,14 +28,14 @@ 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
+  TARGET = $(DIR_INFO)/$(THISAPP)-install
 else
   TARGET = $(DIR_INFO)/$(THISAPP)
 endif
@@ -60,6 +52,7 @@ objects = $(DL_FILE)
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 $(DL_FILE)_MD5 = af9d9e03038481fbf79ea3ac33f116f9
+
 install : $(TARGET)
 
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -90,34 +83,28 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@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) && 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 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
+	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) && 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
+	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) && 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)