[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 57e682114e87ea9ed4cc419aea17dfd63cf3917b
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 57e682114e87ea9ed4cc419aea17dfd63cf3917b (commit) via 933377600e8230e688cd760d031af538c2f4c8bf (commit) via 4b8ede3119e17390a0ca799f39ef31d6bdfb1905 (commit) via 9bddee0a1d355a417f5511d84f23a044aa6d3825 (commit) via b675537a691e1ffeb532b43c6fea1654b421f27b (commit) via 36d351ff3b607f2150e9cedb3e1563a2591e3bb7 (commit) via a3c645aa96b3942487c475dcba77f6d6f06ce861 (commit) from 3dfca97cc17b713f7a4516a12e53dc3608305ff0 (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 57e682114e87ea9ed4cc419aea17dfd63cf3917b Merge: 9333776 4b8ede3 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Oct 30 21:37:44 2010 +0200
Merge commit 'origin/master' into next
Conflicts: make.sh
commit 933377600e8230e688cd760d031af538c2f4c8bf Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Oct 30 21:36:25 2010 +0200
Kernel Update (2.6.32.25).
-----------------------------------------------------------------------
Summary of changes: config/kernel/kernel.config.i586-ipfire | 6 +++--- config/kernel/kernel.config.i586-ipfire-pae | 4 ++-- config/rootfiles/{oldcore/24 => core/42}/exclude | 0 config/rootfiles/core/42/filelists/files | 1 + config/rootfiles/core/{test => 42}/meta | 0 config/rootfiles/{oldcore/35 => core/42}/update.sh | 17 +++++++++-------- config/rootfiles/core/test/update.sh | 2 +- langs/fr/cgi-bin/fr.pl | 4 ++-- lfs/linux | 17 +++++++---------- make.sh | 4 ++-- src/paks/linux-pae/install.sh | 2 +- src/paks/linux-xen/install.sh | 2 +- 12 files changed, 29 insertions(+), 30 deletions(-) copy config/rootfiles/{oldcore/24 => core/42}/exclude (100%) create mode 100644 config/rootfiles/core/42/filelists/files copy config/rootfiles/core/{test => 42}/meta (100%) copy config/rootfiles/{oldcore/35 => core/42}/update.sh (87%)
Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 6072dfc..9e27f08 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.18 -# Sat Aug 14 21:21:26 2010 +# Linux kernel version: 2.6.32.25 +# Sat Oct 30 11:06:16 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -54,6 +54,7 @@ CONFIG_X86_HT=y CONFIG_X86_TRAMPOLINE=y CONFIG_X86_32_LAZY_GS=y CONFIG_KTIME_SCALAR=y +CONFIG_ARCH_CPU_PROBE_RELEASE=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_CONSTRUCTORS=y
@@ -3924,7 +3925,6 @@ CONFIG_LZO_DECOMPRESS=m CONFIG_DECOMPRESS_GZIP=y CONFIG_DECOMPRESS_BZIP2=y CONFIG_DECOMPRESS_LZMA=y -CONFIG_DECOMPRESS_LZMA_NEEDED=y CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index c00cf8a..f0dee5a 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.32.24 -# Tue Oct 12 18:22:33 2010 +# Linux kernel version: 2.6.32.25 +# Sat Oct 30 10:35:39 2010 # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/config/rootfiles/core/42/exclude b/config/rootfiles/core/42/exclude new file mode 100644 index 0000000..e69de29 diff --git a/config/rootfiles/core/42/filelists/files b/config/rootfiles/core/42/filelists/files new file mode 100644 index 0000000..0037af1 --- /dev/null +++ b/config/rootfiles/core/42/filelists/files @@ -0,0 +1 @@ +etc/system-release diff --git a/config/rootfiles/core/42/meta b/config/rootfiles/core/42/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/42/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/42/update.sh b/config/rootfiles/core/42/update.sh new file mode 100644 index 0000000..6b54995 --- /dev/null +++ b/config/rootfiles/core/42/update.sh @@ -0,0 +1,48 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire 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. # +# # +# IPFire 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 IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2010 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +#Stop services + +# +#Extract files +extract_files + +# +#Start services + +# +#Update Language cache +#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +#Rebuild module dep's +#depmod 2.6.32.15-ipfire +#depmod 2.6.32.15-ipfire-xen + +# +#Finish +#Don't report the exitcode last command +exit 0 diff --git a/config/rootfiles/core/test/update.sh b/config/rootfiles/core/test/update.sh index 078e503..dd837ee 100644 --- a/config/rootfiles/core/test/update.sh +++ b/config/rootfiles/core/test/update.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # -KVER="2.6.32.24" +KVER="2.6.32.25" MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden echo $MOUNT > /dev/null diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index 0179e73..70ef214 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -543,13 +543,13 @@ 'could not open update information file' => 'Impossible d'ouvrir le fichier d'information de mise à jour. Le fichier est corrompu.', 'could not retrieve common name from certificate' => 'Impossible de récupérer le nom courant depuis le certificat.', 'country' => 'Pays', -'cpu idle usage' => 'Utilisation du CPU', +'cpu idle usage' => 'Pourcentage d'inactivite CPU', 'cpu interrupt usage' => 'Utilisation des interruptions CPU', 'cpu iowait usage' => 'Le COU attend des IO', 'cpu irq usage' => 'Utilisation CPU IRQ', 'cpu nice usage' => 'Utilisation CPU Nice', 'cpu steal usage' => 'Utilisation CPU Steal', -'cpu system usage' => 'Utilisation CPU Système', +'cpu system usage' => 'Utilisation CPU Systeme', 'cpu usage per' => 'Utilisation du CPU par', 'cpu user usage' => 'Utilisation du CPU par l'utilisateur', 'create' => 'Créer', diff --git a/lfs/linux b/lfs/linux index 2955ac6..303d62c 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@
include Config
-PATCHLEVEL = .24 -VER = 2.6.32.24 +PATCHLEVEL = .25 +VER = 2.6.32.25
THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -60,19 +60,19 @@ objects =$(DL_FILE) \ netfilter-layer7-v2.22.tar.gz \ patch-2.6.16-nath323-1.3.bz2 \ reiser4-for-2.6.32.patch.bz2 \ - xen-patches-2.6.32-2c.tar.bz2 + xen-patches-2.6.32-2d.tar.bz2
$(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) netfilter-layer7-v2.22.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.22.tar.gz patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2 reiser4-for-2.6.32.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2 -xen-patches-2.6.32-2c.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2c.tar.bz2 +xen-patches-2.6.32-2d.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2d.tar.bz2
-$(DL_FILE)_MD5 = bcd2f2b3d6974a9232b9becee8196634 +$(DL_FILE)_MD5 = 0d6ad4e7e387f56c5b5831beb97c0c1f netfilter-layer7-v2.22.tar.gz_MD5 = 98dff8a3d5a31885b73341633f69501f patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138 reiser4-for-2.6.32.patch.bz2_MD5 = 3246397973d9271eb8e6d7c97c5d2d91 -xen-patches-2.6.32-2c.tar.bz2_MD5 = 62a75ddcba43894b20f754a94b299ce6 +xen-patches-2.6.32-2d.tar.bz2_MD5 = d1690d2b8b0c9124897981aea505f8f7
install : $(TARGET)
@@ -110,7 +110,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ifeq "$(XEN)" "1" # Apply gentoo Xen patches mkdir -p $(DIR_SRC)/xen-patches - cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2c.tar.bz2 + cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2d.tar.bz2
for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \ echo "*********** [Patch: $$x]"; \ @@ -131,9 +131,6 @@ endif # Reiser4 (don't check if fail (some patches are already in xen patchset) -cd $(DIR_APP) && bzcat $(DIR_DL)/reiser4-for-2.6.32.patch.bz2 | patch -Np1
- # Fix lag's at cache access (eg. quit of mc) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6-vmscan_remove_wait_on_page_writeback.patch - # ipp2p 0.8.2-pomng cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-ipp2p-0.8.2-pomng.patch
diff --git a/make.sh b/make.sh index 577a123..1592336 100755 --- a/make.sh +++ b/make.sh @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.8test" # Version number -CORE="41" # Core Level (Filename) -PAKFIRE_CORE="40" # Core Level (PAKFIRE) +CORE="42" # Core Level (Filename) +PAKFIRE_CORE="41" # Core Level (PAKFIRE) GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index c2fc3d8..384a31d 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.24 +KVER=2.6.32.25 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index 8b46c89..c80c0fd 100644 --- a/src/paks/linux-xen/install.sh +++ b/src/paks/linux-xen/install.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.24 +KVER=2.6.32.25 ROOT=`mount | grep " / " | cut -d" " -f1` ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` if [ ! -z $ROOTUUID ]; then
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org