Kernel update to 2.6.27.39 (current stable).

This commit is contained in:
Arne Fitzenreiter
2009-11-12 15:37:48 +01:00
parent cfa7a86346
commit b3cede08dd
6 changed files with 135 additions and 45 deletions

View File

@@ -4,6 +4,11 @@ boot/config-KVER-ipfire
boot/vmlinuz-KVER-ipfire
boot/vmlinuz-ipfire
#lib/firmware/atmsar11.fw
#lib/firmware/cpia2
#lib/firmware/cpia2/stv0672_vp4.bin
#lib/firmware/dabusb
#lib/firmware/dabusb/bitstream.bin
#lib/firmware/dabusb/firmware.fw
#lib/firmware/dsp56k
#lib/firmware/dsp56k/bootstrap.bin
#lib/firmware/edgeport
@@ -26,10 +31,10 @@ boot/vmlinuz-ipfire
#lib/firmware/ess/maestro3_assp_minisrc.fw
#lib/firmware/intelliport2.bin
#lib/firmware/kaweth
lib/firmware/kaweth/new_code.bin
lib/firmware/kaweth/new_code_fix.bin
lib/firmware/kaweth/trigger_code.bin
lib/firmware/kaweth/trigger_code_fix.bin
#lib/firmware/kaweth/new_code.bin
#lib/firmware/kaweth/new_code_fix.bin
#lib/firmware/kaweth/trigger_code.bin
#lib/firmware/kaweth/trigger_code_fix.bin
#lib/firmware/keyspan
#lib/firmware/keyspan/mpr.fw
#lib/firmware/keyspan/usa18x.fw
@@ -57,6 +62,10 @@ lib/firmware/kaweth/trigger_code_fix.bin
#lib/firmware/ti_3410.fw
#lib/firmware/ti_5052.fw
#lib/firmware/tr_smctr.bin
#lib/firmware/ttusb-budget
#lib/firmware/ttusb-budget/dspbootcode.bin
#lib/firmware/vicam
#lib/firmware/vicam/firmware.fw
#lib/firmware/whiteheat.fw
#lib/firmware/whiteheat_loader.fw
#lib/firmware/yamaha

View File

@@ -0,0 +1 @@
../../../common/linux

View File

@@ -0,0 +1 @@
../../../common/linux-firmware

View File

@@ -24,16 +24,108 @@
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
#
#Stop services
KVER="2.6.27.39"
ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
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
echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES
#
extract_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 ...
#
#Start services
rm -rf /boot/System.map-*
rm -rf /boot/config-*
rm -rf /boot/ipfirerd-*
rm -rf /boot/vmlinuz-*
# Don't remove old xen modules. Kernel may stored outside.
rm -rf /lib/modules/*-ipfire
#
#Update Language cache
#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#Rebuild module dep's
#depmod -a
#Don't report the exitcode of depmod
exit 0
# Backup grub.conf
#
cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
#
# Unpack the updated files
#
echo
echo Unpack the updated files ...
#
tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
--no-overwrite-dir
#
# Modify grub.conf
#
echo
echo Update grub configuration ...
sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf
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
#
# Made emergency - initramdisk
#
echo
echo Create new Initramdisks ...
cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
sed -i "s| autodetect | |g" /etc/mkinitcpio.conf
mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER-emergency.img
cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
#
# Made initramdisk
#
if [ "${ROOT:0:7}" == "/dev/sd" ]; then
# Remove ide hook if root is on sda
sed -i "s| ide | |g" /etc/mkinitcpio.conf
else
if [ "${ROOT:0:7}" == "/dev/hd" ]; then
# Remove pata & sata hook if root is on hda
sed -i "s| pata | |g" /etc/mkinitcpio.conf
sed -i "s| sata | |g" /etc/mkinitcpio.conf
fi
fi
mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
#
# 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...
#
rm -rf /etc/sysconfig/lm_sensors
#
# This core-update need a reboot
/usr/bin/logger -p syslog.emerg -t core-upgrade-34 "Upgrade finished. If you use a customized grub.cfg"
/usr/bin/logger -p syslog.emerg -t core-upgrade-34 "Check it before reboot !!!"
/usr/bin/logger -p syslog.emerg -t core-upgrade-34 " *** Please reboot... *** "