* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0976ce2f192b75a332813cb83239f523ef90954a
@ 2013-01-17 19:40 git
0 siblings, 0 replies; only message in thread
From: git @ 2013-01-17 19:40 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 9116 bytes --]
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, next has been updated
via 0976ce2f192b75a332813cb83239f523ef90954a (commit)
via dc0c6fbbd8919f8c8e083c88db928a2f5b57232e (commit)
via 3e5f2ee99d7431be19c09971b38e1ee3ee040bce (commit)
from 60cc2e54a74de59f7bbecac7965d7aa58a3fda2e (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 0976ce2f192b75a332813cb83239f523ef90954a
Author: Arne Fitzenreiter <Arne_F(a)ipfire.org>
Date: Thu Jan 17 20:38:01 2013 +0100
fstrim: add daily cronjob.
commit dc0c6fbbd8919f8c8e083c88db928a2f5b57232e
Author: Arne Fitzenreiter <Arne_F(a)ipfire.org>
Date: Thu Jan 17 18:42:10 2013 +0100
fstrim: new common package.
commit 3e5f2ee99d7431be19c09971b38e1ee3ee040bce
Author: Arne Fitzenreiter <Arne_F(a)ipfire.org>
Date: Thu Jan 17 07:41:15 2013 +0100
kernel: updated to 3.2.37.
-----------------------------------------------------------------------
Summary of changes:
config/fstrim/trim | 8 ++++++++
config/rootfiles/common/fstrim | 2 ++
config/rootfiles/core/66/filelists/fstrim | 1 +
config/rootfiles/core/66/update.sh | 8 ++++----
lfs/{conntrack-tools => fstrim} | 15 ++++++++-------
lfs/linux | 7 ++++---
make.sh | 1 +
7 files changed, 28 insertions(+), 14 deletions(-)
create mode 100644 config/fstrim/trim
create mode 100644 config/rootfiles/common/fstrim
create mode 120000 config/rootfiles/core/66/filelists/fstrim
copy lfs/{conntrack-tools => fstrim} (90%)
Difference in files:
diff --git a/config/fstrim/trim b/config/fstrim/trim
new file mode 100644
index 0000000..6f61a63
--- /dev/null
+++ b/config/fstrim/trim
@@ -0,0 +1,8 @@
+#!/bin/bash
+#
+# Script to trim free space on solid state drives.
+#
+for i in / /boot /var; do
+ fstrim $i 2>&1 >/dev/null
+done
+
diff --git a/config/rootfiles/common/fstrim b/config/rootfiles/common/fstrim
new file mode 100644
index 0000000..775fa92
--- /dev/null
+++ b/config/rootfiles/common/fstrim
@@ -0,0 +1,2 @@
+etc/fcron.daily/trim
+usr/bin/fstrim
diff --git a/config/rootfiles/core/66/filelists/fstrim b/config/rootfiles/core/66/filelists/fstrim
new file mode 120000
index 0000000..5541351
--- /dev/null
+++ b/config/rootfiles/core/66/filelists/fstrim
@@ -0,0 +1 @@
+../../../common/fstrim
\ No newline at end of file
diff --git a/config/rootfiles/core/66/update.sh b/config/rootfiles/core/66/update.sh
index 4a3f38d..97fcf8f 100644
--- a/config/rootfiles/core/66/update.sh
+++ b/config/rootfiles/core/66/update.sh
@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
-# Copyright (C) 2012 IPFire-Team <info(a)ipfire.org>. #
+# Copyright (C) 2013 IPFire-Team <info(a)ipfire.org>. #
# #
############################################################################
#
@@ -78,7 +78,7 @@ fi
#
#
-KVER="3.2.35"
+KVER="3.2.37"
MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 `
# Nur den letzten Parameter verwenden
echo $MOUNT > /dev/null
@@ -320,8 +320,8 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
"core-update-$core: WARNING not enough space for pae kernel."
else
echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
- echo "ProgVersion: 3.2.35" >> /opt/pakfire/db/installed/meta-linux-pae
- echo "Release: 25" >> /opt/pakfire/db/installed/meta-linux-pae
+ echo "ProgVersion: 3.2.37" >> /opt/pakfire/db/installed/meta-linux-pae
+ echo "Release: 26" >> /opt/pakfire/db/installed/meta-linux-pae
fi
fi
diff --git a/lfs/fstrim b/lfs/fstrim
new file mode 100644
index 0000000..451af5a
--- /dev/null
+++ b/lfs/fstrim
@@ -0,0 +1,78 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2013 IPFire Team <info(a)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/linux b/lfs/linux
index e85f21a..2bdb9a5 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
include Config
-VER = 3.2.36
+VER = 3.2.37
RPI_PATCHES = linux-3.2.27-ada8b44
@@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
CFLAGS =
CXXFLAGS =
-PAK_VER = 26
+PAK_VER = 27
DEPS = ""
VERSUFIX=ipfire$(KCFG)
@@ -71,9 +71,10 @@ objects =$(DL_FILE) \
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE)
rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
-$(DL_FILE)_MD5 = 9b92ea2160a9a383fad7487b5cfd653b
+$(DL_FILE)_MD5 = 741f0ee132734b8ed887ad1d87cc202b
rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 966687ff27e450e04ff50e0da829dc00
+
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
diff --git a/make.sh b/make.sh
index b1d7cf6..95c80cb 100755
--- a/make.sh
+++ b/make.sh
@@ -752,6 +752,7 @@ buildipfire() {
ipfiremake stress
ipfiremake libstatgrab
ipfiremake sarg
+ ipfiremake fstrim
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-01-17 19:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-17 19:40 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0976ce2f192b75a332813cb83239f523ef90954a git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox