[git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. b7aff3d7143174d379570319aaad65afabbf76d3 - IPFire-SCM

11 Jan 2014

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, fifteen has been updated
       via  b7aff3d7143174d379570319aaad65afabbf76d3 (commit)
       via  621e8d148b27125db48f50f0b11bd75454d909bb (commit)
       via  2d0e29fcfb429f057901b2799fc88bb30a3be2f0 (commit)
      from  e9e998099e2b82dd84062a0d2d9ce24bdc7a294c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b7aff3d7143174d379570319aaad65afabbf76d3
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sat Jan 11 14:21:02 2014 +0100
util-linux: remove extern fstrim and eject packages.
commit 621e8d148b27125db48f50f0b11bd75454d909bb
Merge: 2d0e29f e9e9980
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sat Jan 11 14:20:16 2014 +0100
Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen
commit 2d0e29fcfb429f057901b2799fc88bb30a3be2f0
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sat Jan 11 08:36:17 2014 +0100
fifteen: rename /etc/modprobe.d config files.
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/common/armv5tel/util-linux |  2 +
 config/rootfiles/common/eject               | 14 ------
 config/rootfiles/common/fstrim              |  2 -
 config/rootfiles/common/i586/util-linux     |  2 +
 config/rootfiles/core/fifteen/update.sh     |  5 ++
 lfs/eject                                   | 77 ----------------------------
 lfs/fstrim                                  | 78 -----------------------------
 lfs/util-linux                              |  3 ++
 make.sh                                     |  2 -
 9 files changed, 12 insertions(+), 173 deletions(-)
 delete mode 100644 config/rootfiles/common/eject
 delete mode 100644 config/rootfiles/common/fstrim
 delete mode 100644 lfs/eject
 delete mode 100644 lfs/fstrim
Difference in files:

diff --git a/config/rootfiles/common/armv5tel/util-linux b/config/rootfiles/common/armv5tel/util-linux
index 2cefab0..85b027d 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 988d1b7..0000000
--- 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 775fa92..0000000
--- 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 7ab118a..ea3de18 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/config/rootfiles/core/fifteen/update.sh b/config/rootfiles/core/fifteen/update.sh
index 54e756c..12d6b1c 100644
--- a/config/rootfiles/core/fifteen/update.sh
+++ b/config/rootfiles/core/fifteen/update.sh
@@ -174,6 +174,11 @@ esac
 # Remove the old default theme
 rm -rf /srv/web/ipfire/html/themes/ipfire
+# rename /etc/modprobe.d files
+for i in $(find /etc/modprobe.d/* | grep -v ".conf")
+	mv $i $i.conf
+done
+
 #
 #Extract files
 tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
diff --git a/lfs/eject b/lfs/eject
deleted file mode 100644
index 8683194..0000000
--- 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 http://www.gnu.org/licenses/.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# 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 451af5a..0000000
--- a/lfs/fstrim
+++ /dev/null
@@ -1,78 +0,0 @@
-###############################################################################
-#                                                                             #
-# 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 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 http://www.gnu.org/licenses/.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# 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 40f371b..7f69e67 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 5aabdf8..18c2999 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
hooks/post-receive
--
IPFire 2.x development tree

    