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 3c5139b61345b45719f4f07c2402b4a4f336c461 (commit) via a947a7a6474ca88db006652fe7a0d37433af4fd3 (commit) via de02755c2bf93dac51ac0623244efca718aac06d (commit) via 0c345920dd97a4f7cf8b246ef8044cbd7a04a8eb (commit) from 7124bb3468cfd230c32a752b1844c1a7fdec04d8 (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 3c5139b61345b45719f4f07c2402b4a4f336c461 Merge: a947a7a 7124bb3 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 14 19:02:07 2011 +0200
Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
commit a947a7a6474ca88db006652fe7a0d37433af4fd3 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 14 19:01:16 2011 +0200
Create "next" core update for testing.
commit de02755c2bf93dac51ac0623244efca718aac06d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 14 15:53:03 2011 +0200
kernel: enabled bigsmp and set 256 cpus.
commit 0c345920dd97a4f7cf8b246ef8044cbd7a04a8eb Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat May 14 10:51:06 2011 +0200
kernel: update to 2.6.32.40.
-----------------------------------------------------------------------
Summary of changes: config/kernel/kernel.config.i586-ipfire-pae | 32 ++++-- config/rootfiles/{oldcore/44 => core/next}/exclude | 0 .../{oldcore/44 => core/next}/filelists/dracut | 0 config/rootfiles/core/next/filelists/files | 2 + .../{oldcore/38 => core/next}/filelists/grub | 0 .../{oldcore/28 => core/next}/filelists/linux | 0 config/rootfiles/core/{49 => next}/meta | 0 .../rootfiles/{oldcore/31 => core/next}/update.sh | 124 +++++++++++--------- lfs/linux | 6 +- src/paks/linux-pae/install.sh | 2 +- src/paks/linux-xen/install.sh | 2 +- 11 files changed, 97 insertions(+), 71 deletions(-) copy config/rootfiles/{oldcore/44 => core/next}/exclude (100%) copy config/rootfiles/{oldcore/44 => core/next}/filelists/dracut (100%) create mode 100644 config/rootfiles/core/next/filelists/files copy config/rootfiles/{oldcore/38 => core/next}/filelists/grub (100%) copy config/rootfiles/{oldcore/28 => core/next}/filelists/linux (100%) copy config/rootfiles/core/{49 => next}/meta (100%) copy config/rootfiles/{oldcore/31 => core/next}/update.sh (58%)
Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index 6d82de4..8c7cf4b 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.27-ipfire -# Thu Dec 30 13:35:50 2010 +# Linux kernel version: 2.6.32.40 +# Sat May 14 09:27:43 2011 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -96,7 +96,6 @@ CONFIG_RCU_FANOUT=32 # CONFIG_IKCONFIG is not set CONFIG_LOG_BUF_SHIFT=17 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y -# CONFIG_GROUP_SCHED is not set # CONFIG_CGROUPS is not set CONFIG_SYSFS_DEPRECATED=y CONFIG_SYSFS_DEPRECATED_V2=y @@ -203,8 +202,9 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_SMP=y CONFIG_SPARSE_IRQ=y +CONFIG_NUMA_IRQ_DESC=y CONFIG_X86_MPPARSE=y -# CONFIG_X86_BIGSMP is not set +CONFIG_X86_BIGSMP=y CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_ELAN is not set # CONFIG_X86_MRST is not set @@ -280,10 +280,10 @@ CONFIG_HPET_EMULATE_RTC=y CONFIG_DMI=y # CONFIG_IOMMU_HELPER is not set CONFIG_IOMMU_API=y -CONFIG_NR_CPUS=8 -CONFIG_IRQ_TIME_ACCOUNTING=y +CONFIG_NR_CPUS=256 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y +CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_PREEMPT_NONE=y # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PREEMPT is not set @@ -314,19 +314,29 @@ CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_HIGHMEM=y CONFIG_X86_PAE=y CONFIG_ARCH_PHYS_ADDR_T_64BIT=y -CONFIG_ARCH_FLATMEM_ENABLE=y +CONFIG_NUMA=y +CONFIG_NODES_SHIFT=3 +CONFIG_HAVE_ARCH_BOOTMEM=y +CONFIG_ARCH_HAVE_MEMORY_PRESENT=y +CONFIG_NEED_NODE_MEMMAP_SIZE=y +CONFIG_HAVE_ARCH_ALLOC_REMAP=y +CONFIG_ARCH_DISCONTIGMEM_ENABLE=y +CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SELECT_MEMORY_MODEL=y CONFIG_ILLEGAL_POINTER_VALUE=0 CONFIG_SELECT_MEMORY_MODEL=y -CONFIG_FLATMEM_MANUAL=y -# CONFIG_DISCONTIGMEM_MANUAL is not set +# CONFIG_FLATMEM_MANUAL is not set +CONFIG_DISCONTIGMEM_MANUAL=y # CONFIG_SPARSEMEM_MANUAL is not set -CONFIG_FLATMEM=y +CONFIG_DISCONTIGMEM=y CONFIG_FLAT_NODE_MEM_MAP=y +CONFIG_NEED_MULTIPLE_NODES=y +CONFIG_HAVE_MEMORY_PRESENT=y CONFIG_SPARSEMEM_STATIC=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_MIGRATION=y CONFIG_PHYS_ADDR_T_64BIT=y CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y @@ -363,6 +373,7 @@ CONFIG_HOTPLUG_CPU=y CONFIG_COMPAT_VDSO=y # CONFIG_CMDLINE_BOOL is not set CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +# CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID is not set
# # Power management and ACPI options @@ -392,6 +403,7 @@ CONFIG_ACPI_PROCESSOR=m CONFIG_ACPI_HOTPLUG_CPU=y CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_THERMAL=m +# CONFIG_ACPI_NUMA is not set CONFIG_ACPI_CUSTOM_DSDT_FILE="" # CONFIG_ACPI_CUSTOM_DSDT is not set CONFIG_ACPI_BLACKLIST_YEAR=0 diff --git a/config/rootfiles/core/next/exclude b/config/rootfiles/core/next/exclude new file mode 100644 index 0000000..c2bceb8 --- /dev/null +++ b/config/rootfiles/core/next/exclude @@ -0,0 +1,6 @@ +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache diff --git a/config/rootfiles/core/next/filelists/dracut b/config/rootfiles/core/next/filelists/dracut new file mode 120000 index 0000000..1608699 --- /dev/null +++ b/config/rootfiles/core/next/filelists/dracut @@ -0,0 +1 @@ +../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/files b/config/rootfiles/core/next/filelists/files new file mode 100644 index 0000000..409e5fe --- /dev/null +++ b/config/rootfiles/core/next/filelists/files @@ -0,0 +1,2 @@ +etc/system-release +etc/issue diff --git a/config/rootfiles/core/next/filelists/grub b/config/rootfiles/core/next/filelists/grub new file mode 120000 index 0000000..050745c --- /dev/null +++ b/config/rootfiles/core/next/filelists/grub @@ -0,0 +1 @@ +../../../common/grub \ No newline at end of file diff --git a/config/rootfiles/core/next/filelists/linux b/config/rootfiles/core/next/filelists/linux new file mode 120000 index 0000000..c469fe1 --- /dev/null +++ b/config/rootfiles/core/next/filelists/linux @@ -0,0 +1 @@ +../../../common/linux \ No newline at end of file diff --git a/config/rootfiles/core/next/meta b/config/rootfiles/core/next/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/next/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/next/update.sh b/config/rootfiles/core/next/update.sh new file mode 100644 index 0000000..68c3af5 --- /dev/null +++ b/config/rootfiles/core/next/update.sh @@ -0,0 +1,163 @@ +#!/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) 2011 IPFire-Team info@ipfire.org. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 +# +KVER="2.6.32.40" +MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` +# Nur den letzten Parameter verwenden +echo $MOUNT > /dev/null +MOUNT=$_ +if [ ! $MOUNT == "rw" ]; then + MOUNT="ro" +fi + + +# +# check if we the backup file already exist +if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then + echo Moving backup to backup-old ... + mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ + /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2 +fi +echo First we made a backup of all files that was inside of the +echo update archive. This may take a while ... +# Add some files that are not in the package to backup +echo lib/modules >> /opt/pakfire/tmp/ROOTFILES +echo boot >> /opt/pakfire/tmp/ROOTFILES + +# Backup the files +tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ + -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1 + +echo +echo Update Kernel to $KVER ... +# Remove old kernel, configs, initrd, modules ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/vmlinuz-* +rm -rf /lib/modules/*-ipfire +# +# Backup grub.conf +# +cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org + +# +# Stop services to save memory +# +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop + +# +# Unpack the updated files +# +echo +echo Unpack the updated files ... +# +tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ + --no-overwrite-dir + +# +# Start services +# +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# +# Modify grub.conf +# +echo +echo Update grub configuration ... +ROOT=`mount | grep " / " | cut -d" " -f1` +if [ ! -z $ROOT ]; then + ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` +fi +if [ ! -z $ROOTUUID ]; then + sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf +else + sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf +fi +sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf +sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf + +if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then + echo "grub use default console ..." +else + echo "grub use serial console ..." + sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf + sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf + sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf + sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf +fi +# +# ReInstall grub +# +grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck +# +# Rebuild Language +# +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# +# Delete old lm-sensor modullist to force search at next boot +# +rm -rf /etc/sysconfig/lm_sensors +## +## Change version of Pakfire.conf +## +#OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2` +#NEWVERSION="2.9" +#sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf +## +## After pakfire has ended run it again and update the lists and do upgrade +## +#echo '#!/bin/bash' > /tmp/pak_update +#echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +#echo ' sleep 1' >> /tmp/pak_update +#echo 'done' >> /tmp/pak_update +#echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +#echo ' sleep 1' >> /tmp/pak_update +#echo 'done' >> /tmp/pak_update +#echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +#echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +#echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +#echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +#echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-44 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update +#echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-44 "Check it before reboot !!!"' >> /tmp/pak_update +#echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-44 " *** Please reboot... *** "' >> /tmp/pak_update +#echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +#chmod +x /tmp/pak_update +#/tmp/pak_update & +#echo +#echo Please wait until pakfire has ended... +#echo +/usr/bin/logger -p syslog.emerg -t core-upgrade-next "Upgrade finished. If you use a customized grub.cfg" +/usr/bin/logger -p syslog.emerg -t core-upgrade-next "Check it before reboot !!!" +/usr/bin/logger -p syslog.emerg -t core-upgrade-next " *** Please reboot... *** " diff --git a/lfs/linux b/lfs/linux index d9df8fc..16ae152 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@
include Config
-PATCHLEVEL = .39 -VER = 2.6.32.39 +PATCHLEVEL = .40 +VER = 2.6.32.40
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 = e0e741937640a875392b1820e945be25 +$(DL_FILE)_MD5 = 043403f6264c1ec0aea67a5f039d0a31 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 01e59eb..1a663e9 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.39 +KVER=2.6.32.40 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 f3ffbdb..5e03a74 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.39 +KVER=2.6.32.40 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