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 a0c4de46fa00a83ad5fde5c3c654b296fa012fde (commit) via e1aa5a9bece1ac86808bbc26e54e133a3d7d61e6 (commit) via 94a4640d3a41b9aba5b1e998d78db63f32c70df1 (commit) from 9eca0c864505f02d794d00d46c53aa91524371b4 (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 a0c4de46fa00a83ad5fde5c3c654b296fa012fde Merge: e1aa5a9 94a4640 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon May 23 23:56:10 2011 +0200
Merge branch 'master' into next
commit e1aa5a9bece1ac86808bbc26e54e133a3d7d61e6 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon May 23 23:54:50 2011 +0200
kernel: update to 2.6.32.41.
-----------------------------------------------------------------------
Summary of changes: config/mpfire/webradio | 1 + config/rootfiles/core/next/update.sh | 2 +- lfs/linux | 6 +++--- src/paks/linux-pae/install.sh | 4 ++-- src/paks/linux-pae/update.sh | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-)
Difference in files: diff --git a/config/mpfire/webradio b/config/mpfire/webradio index e11f6e3..402c31a 100644 --- a/config/mpfire/webradio +++ b/config/mpfire/webradio @@ -10,4 +10,5 @@ rmnradio.powerstream.de:8022|RMNradio|http://www.rmnradio.de/ relay.radio.ethz.ch:8000/kohina.ogg|Kohina|http://www.kohina.com relay1.slayradio.org:8000|Slay Radio|http://www.slayradio.com/ demovibes.de:8000/necta128.ogg|Nectarine Demoscene Radio|http://www.scenemusic.eu/ +r1.scenesat.com:8000/scenesathi|SceneSat Radio|http://www.scenesat.com radioparadise.steadyhost.com:8060|Radio Paradise|http://www.radioparadise.com/ diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh index 68c3af5..444fcce 100644 --- a/config/rootfiles/core/next/update.sh +++ b/config/rootfiles/core/next/update.sh @@ -24,7 +24,7 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 # -KVER="2.6.32.40" +KVER="2.6.32.41" MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` # Nur den letzten Parameter verwenden echo $MOUNT > /dev/null diff --git a/lfs/linux b/lfs/linux index 16ae152..fcae433 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@
include Config
-PATCHLEVEL = .40 -VER = 2.6.32.40 +PATCHLEVEL = .41 +VER = 2.6.32.41
THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -68,7 +68,7 @@ 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-2f.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2f.tar.bz2
-$(DL_FILE)_MD5 = 043403f6264c1ec0aea67a5f039d0a31 +$(DL_FILE)_MD5 = 919fe13fe57f903eb03e291dcaeabf57 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 diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh index 1a663e9..83e9f49 100644 --- a/src/paks/linux-pae/install.sh +++ b/src/paks/linux-pae/install.sh @@ -17,14 +17,14 @@ # 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. # +# Copyright (C) 2007-2011 IPFire-Team info@ipfire.org. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh extract_files # -KVER=2.6.32.40 +KVER=2.6.32.41 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-pae/update.sh b/src/paks/linux-pae/update.sh index abbaf47..2878dfb 100644 --- a/src/paks/linux-pae/update.sh +++ b/src/paks/linux-pae/update.sh @@ -17,11 +17,11 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007 IPFire-Team info@ipfire.org. # +# Copyright (C) 2007-2011 IPFire-Team info@ipfire.org. # # # ############################################################################ # . /opt/pakfire/lib/functions.sh -#Don't remove old xen kernel at update +#Don't remove old pae kernel at update #./uninstall.sh ./install.sh
hooks/post-receive -- IPFire 2.x development tree