From: Arne Fitzenreiter Date: Sat, 11 Jan 2014 13:21:02 +0000 (+0100) Subject: util-linux: remove extern fstrim and eject packages. X-Git-Tag: v2.15-beta1~1 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=b7aff3d7143174d379570319aaad65afabbf76d3 util-linux: remove extern fstrim and eject packages. --- diff --git a/config/rootfiles/common/armv5tel/util-linux b/config/rootfiles/common/armv5tel/util-linux index 2cefab08f3..85b027d837 100644 --- a/config/rootfiles/common/armv5tel/util-linux +++ b/config/rootfiles/common/armv5tel/util-linux @@ -5,6 +5,8 @@ bin/more bin/mount bin/umount bin/wdctl +#etc/fcron.daily +etc/fcron.daily/trim lib/libblkid.so.1.1.0 lib/libmount.so.1 lib/libmount.so.1.1.0 diff --git a/config/rootfiles/common/eject b/config/rootfiles/common/eject deleted file mode 100644 index 988d1b7645..0000000000 --- a/config/rootfiles/common/eject +++ /dev/null @@ -1,14 +0,0 @@ -usr/bin/eject -usr/bin/volname -#usr/man/man1/eject.1 -#usr/man/man1/volname.1 -#usr/share/locale/cs_CZ -#usr/share/locale/cs_CZ/LC_MESSAGES -#usr/share/locale/cs_CZ/LC_MESSAGES/eject.mo -#usr/share/locale/de/LC_MESSAGES/eject.mo -#usr/share/locale/es/LC_MESSAGES/eject.mo -#usr/share/locale/fr/LC_MESSAGES/eject.mo -#usr/share/locale/ja/LC_MESSAGES/eject.mo -#usr/share/locale/pt_BR/LC_MESSAGES/eject.mo -#usr/share/locale/tr/LC_MESSAGES/eject.mo -#usr/share/locale/zh_TW/LC_MESSAGES/eject.mo diff --git a/config/rootfiles/common/fstrim b/config/rootfiles/common/fstrim deleted file mode 100644 index 775fa92864..0000000000 --- a/config/rootfiles/common/fstrim +++ /dev/null @@ -1,2 +0,0 @@ -etc/fcron.daily/trim -usr/bin/fstrim diff --git a/config/rootfiles/common/i586/util-linux b/config/rootfiles/common/i586/util-linux index 7ab118aa12..ea3de18484 100644 --- a/config/rootfiles/common/i586/util-linux +++ b/config/rootfiles/common/i586/util-linux @@ -5,6 +5,8 @@ bin/more bin/mount bin/umount bin/wdctl +#etc/fcron.daily +etc/fcron.daily/trim lib/libblkid.so.1.1.0 lib/libmount.so.1 lib/libmount.so.1.1.0 diff --git a/lfs/eject b/lfs/eject deleted file mode 100644 index 8683194123..0000000000 --- a/lfs/eject +++ /dev/null @@ -1,77 +0,0 @@ -############################################################################### -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# 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 this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 2.1.5 - -THISAPP = eject-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/eject -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = b96a6d4263122f1711db12701d79f738 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/fstrim b/lfs/fstrim deleted file mode 100644 index 451af5ab3a..0000000000 --- a/lfs/fstrim +++ /dev/null @@ -1,78 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team # -# # -# 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 3 of the License, or # -# (at your option) any later version. # -# # -# 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 this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.2 - -THISAPP = fstrim-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/fstrim -TARGET = $(DIR_INFO)/$(THISAPP) - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = 1a217ae44b12ae7538f922f495b8da31 - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) - -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && install -m 0755 fstrim /usr/bin - # Install cronjob - install -m 0755 $(DIR_SRC)/config/fstrim/trim /etc/fcron.daily - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/util-linux b/lfs/util-linux index 40f371b2b8..7f69e67514 100644 --- a/lfs/util-linux +++ b/lfs/util-linux @@ -73,5 +73,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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 + # 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) diff --git a/make.sh b/make.sh index 5aabdf80b7..18c29992da 100755 --- a/make.sh +++ b/make.sh @@ -731,7 +731,6 @@ buildipfire() { ipfiremake usb_modeswitch_data ipfiremake zerofree ipfiremake mdadm - ipfiremake eject ipfiremake pound ipfiremake minicom ipfiremake ddrescue @@ -768,7 +767,6 @@ buildipfire() { ipfiremake stress ipfiremake libstatgrab ipfiremake sarg - ipfiremake fstrim ipfiremake check_mk_agent ipfiremake libdaemon ipfiremake avahi