X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Futil-linux;h=cb8e32d5796589da5df57f2117a53768d0251362;hb=e37e796206b575d87d652c5c68a96296dbbb8543;hp=6aeeeebd52da5531a099a86e299ebf85162eb030;hpb=72d80898e3aca5672bf139a24f0cc598c00e4758;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/util-linux b/lfs/util-linux
index 6aeeeebd52..cb8e32d579 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-2018  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# 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/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,24 +24,15 @@
 
 include Config
 
-VER        = 2.12r
+VER        = 2.28.2
 
 THISAPP    = util-linux-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = util-linux
 
-# 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
 
 ###############################################################################
 # Top-level Rules
@@ -53,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = af9d9e03038481fbf79ea3ac33f116f9
+$(DL_FILE)_MD5 = 46a232a37bce45371a86d19300edc47a
 
 install : $(TARGET)
 
@@ -82,35 +71,22 @@ $(subst %,%_MD5,$(objects)) :
 
 $(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"
-	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)/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
-	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
-else
-	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 $(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) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure \
+		--docdir=/usr/share/doc/util-linux \
+		--disable-static \
+		--disable-nls \
+		--disable-static \
+		--enable-pg \
+		--without-python \
+		--without-systemd \
+		--without-systemdsystemunitdir
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
+
+	# Install fstrim cronjob
+	mkdir -p /etc/fcron.daily
+	install -m 0755 $(DIR_SRC)/config/fstrim/trim /etc/fcron.daily/trim
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)