###############################################################################
-# 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-2013 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/>. #
# #
###############################################################################
include Config
-VER = 2.12r
+VER = 2.24
THISAPP = util-linux-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.xz
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
+TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = af9d9e03038481fbf79ea3ac33f116f9
+$(DL_FILE)_MD5 = 4fac6443427f575fc5f3531a4ad2ca01
install : $(TARGET)
$(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" >> 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
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
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
+ # 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)