rrdtool: Update to 1.7.1

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

diff --git a/lfs/util-linux b/lfs/util-linux
index 924b21461bc17568d045a2c937e03d8b4d829ca5..cb8e32d5796589da5df57f2117a53768d0251362 100644 (file)
--- 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-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>                        #
-#                                                                             #
-# 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/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -32,24 +24,15 @@
 
 include Config
 
-VER        = 2.12r
+VER        = 2.28.2
 
 THISAPP    = util-linux-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
-DL_FROM    = $(URL_KERNEL)/linux/utils/util-linux
+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
@@ -59,7 +42,8 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = af9d9e03038481fbf79ea3ac33f116f9
+$(DL_FILE)_MD5 = 46a232a37bce45371a86d19300edc47a
+
 install : $(TARGET)
 
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -87,38 +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"
-       -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
-       -mkdir -p /var/lib/hwclock
-       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
-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) && ./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) && 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)