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

diff --git a/lfs/util-linux b/lfs/util-linux
index 9b0ad5dc5e..b5038801af 100644
--- a/lfs/util-linux
+++ b/lfs/util-linux
@@ -1,22 +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>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -87,12 +85,11 @@ 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/slang" >> 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)/disk-utils && make LDFLAGS=-static mkfs.minix fsck.minix
-	cd $(DIR_APP)/disk-utils && install -m 0755 mkfs.minix /sbin/mkfs.minix.static
-	cd $(DIR_APP)/disk-utils && install -m 0755 fsck.minix /sbin/fsck.minix.static
+	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