mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 19:23:24 +02:00
Kernel update to 2.6.27.39 (current stable).
This commit is contained in:
@@ -4,6 +4,11 @@ boot/config-KVER-ipfire
|
|||||||
boot/vmlinuz-KVER-ipfire
|
boot/vmlinuz-KVER-ipfire
|
||||||
boot/vmlinuz-ipfire
|
boot/vmlinuz-ipfire
|
||||||
#lib/firmware/atmsar11.fw
|
#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
|
||||||
#lib/firmware/dsp56k/bootstrap.bin
|
#lib/firmware/dsp56k/bootstrap.bin
|
||||||
#lib/firmware/edgeport
|
#lib/firmware/edgeport
|
||||||
@@ -26,10 +31,10 @@ boot/vmlinuz-ipfire
|
|||||||
#lib/firmware/ess/maestro3_assp_minisrc.fw
|
#lib/firmware/ess/maestro3_assp_minisrc.fw
|
||||||
#lib/firmware/intelliport2.bin
|
#lib/firmware/intelliport2.bin
|
||||||
#lib/firmware/kaweth
|
#lib/firmware/kaweth
|
||||||
lib/firmware/kaweth/new_code.bin
|
#lib/firmware/kaweth/new_code.bin
|
||||||
lib/firmware/kaweth/new_code_fix.bin
|
#lib/firmware/kaweth/new_code_fix.bin
|
||||||
lib/firmware/kaweth/trigger_code.bin
|
#lib/firmware/kaweth/trigger_code.bin
|
||||||
lib/firmware/kaweth/trigger_code_fix.bin
|
#lib/firmware/kaweth/trigger_code_fix.bin
|
||||||
#lib/firmware/keyspan
|
#lib/firmware/keyspan
|
||||||
#lib/firmware/keyspan/mpr.fw
|
#lib/firmware/keyspan/mpr.fw
|
||||||
#lib/firmware/keyspan/usa18x.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_3410.fw
|
||||||
#lib/firmware/ti_5052.fw
|
#lib/firmware/ti_5052.fw
|
||||||
#lib/firmware/tr_smctr.bin
|
#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.fw
|
||||||
#lib/firmware/whiteheat_loader.fw
|
#lib/firmware/whiteheat_loader.fw
|
||||||
#lib/firmware/yamaha
|
#lib/firmware/yamaha
|
||||||
|
|||||||
1
config/rootfiles/core/34/filelists/linux
Symbolic link
1
config/rootfiles/core/34/filelists/linux
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../../../common/linux
|
||||||
1
config/rootfiles/core/34/filelists/linux-firmware
Symbolic link
1
config/rootfiles/core/34/filelists/linux-firmware
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../../../common/linux-firmware
|
||||||
@@ -24,16 +24,108 @@
|
|||||||
. /opt/pakfire/lib/functions.sh
|
. /opt/pakfire/lib/functions.sh
|
||||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
/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
|
# Backup grub.conf
|
||||||
#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
|
#
|
||||||
#Rebuild module dep's
|
cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
|
||||||
#depmod -a
|
#
|
||||||
#Don't report the exitcode of depmod
|
# Unpack the updated files
|
||||||
exit 0
|
#
|
||||||
|
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... *** "
|
||||||
|
|||||||
@@ -36,15 +36,14 @@
|
|||||||
* Unix-Syslog-0.100
|
* Unix-Syslog-0.100
|
||||||
* XML-Parser-2.34
|
* XML-Parser-2.34
|
||||||
* alsa-lib-1.0.19
|
* alsa-lib-1.0.19
|
||||||
* alsa-lib-1.0.19-kmod-2.6.27.31-ipfire
|
* alsa-lib-1.0.19-kmod-2.6.27.39-ipfire
|
||||||
* amavisd-new-2.5.2
|
* amavisd-new-2.5.2
|
||||||
* apcupsd-3.14.4
|
* apcupsd-3.14.4
|
||||||
* applejuice-0.31
|
* applejuice-0.31
|
||||||
* arping-2.05
|
* arping-2.05
|
||||||
* as86-0.16.17
|
* as86-0.16.17
|
||||||
* asterisk-1.4.18
|
* asterisk-1.4.18
|
||||||
* atl2-2.0.5-kmod-2.6.27.31-ipfire
|
* atl2-2.0.5-kmod-2.6.27.39-ipfire
|
||||||
* atl2-2.0.5-kmod-2.6.27.31-ipfire-xen
|
|
||||||
* autoconf-2.59
|
* autoconf-2.59
|
||||||
* automake-1.9.6
|
* automake-1.9.6
|
||||||
* backup-ipfire
|
* backup-ipfire
|
||||||
@@ -69,8 +68,7 @@
|
|||||||
* clamav-0.95.3
|
* clamav-0.95.3
|
||||||
* cmake-2.4.8
|
* cmake-2.4.8
|
||||||
* collectd-4.5.3
|
* collectd-4.5.3
|
||||||
* compat-wireless-2009-05-30-kmod-2.6.27.31-ipfire
|
* compat-wireless-2009-05-30-kmod-2.6.27.39-ipfire
|
||||||
* compat-wireless-2009-05-30-kmod-2.6.27.31-ipfire-xen
|
|
||||||
* coreutils-5.96
|
* coreutils-5.96
|
||||||
* cpio-2.6
|
* cpio-2.6
|
||||||
* cpufrequtils-005
|
* cpufrequtils-005
|
||||||
@@ -85,8 +83,7 @@
|
|||||||
* diffutils-2.8.1
|
* diffutils-2.8.1
|
||||||
* dnsmasq-2.45
|
* dnsmasq-2.45
|
||||||
* dosfstools-2.11
|
* dosfstools-2.11
|
||||||
* e1000e-1.0.2.5-kmod-2.6.27.31-ipfire
|
* e1000e-1.0.2.5-kmod-2.6.27.39-ipfire
|
||||||
* e1000e-1.0.2.5-kmod-2.6.27.31-ipfire-xen
|
|
||||||
* e2fsprogs-1.39
|
* e2fsprogs-1.39
|
||||||
* ebtables-v2.0.8-2
|
* ebtables-v2.0.8-2
|
||||||
* ed-0.2
|
* ed-0.2
|
||||||
@@ -132,8 +129,7 @@
|
|||||||
* hdparm-8.9
|
* hdparm-8.9
|
||||||
* hostapd-0.6.9
|
* hostapd-0.6.9
|
||||||
* hplip-2.7.10
|
* hplip-2.7.10
|
||||||
* hso-1.9-kmod-2.6.27.31-ipfire
|
* hso-1.9-kmod-2.6.27.39-ipfire
|
||||||
* hso-1.9-kmod-2.6.27.31-ipfire-xen
|
|
||||||
* htop-0.8.1
|
* htop-0.8.1
|
||||||
* httpd-2.2.11
|
* httpd-2.2.11
|
||||||
* hwdata
|
* hwdata
|
||||||
@@ -157,10 +153,9 @@
|
|||||||
* jpegsrc.v6b
|
* jpegsrc.v6b
|
||||||
* kbd-1.12
|
* kbd-1.12
|
||||||
* klibc-1.5.14
|
* klibc-1.5.14
|
||||||
* kqemu-1.4.0pre1-kmod-2.6.27.31-ipfire
|
* kqemu-1.4.0pre1-kmod-2.6.27.39-ipfire
|
||||||
* kqemu-1.4.0pre1-kmod-2.6.27.31-ipfire-xen
|
|
||||||
* kudzu-1.2.64
|
* kudzu-1.2.64
|
||||||
* kvm-kmod-2.6.31.5-kmod-2.6.27.31-ipfire
|
* kvm-kmod-2.6.31.5-kmod-2.6.27.39-ipfire
|
||||||
* l7-protocols-2009-05-10
|
* l7-protocols-2009-05-10
|
||||||
* lame-3.97
|
* lame-3.97
|
||||||
* lcd4linux-0.10.1-RC2
|
* lcd4linux-0.10.1-RC2
|
||||||
@@ -190,8 +185,7 @@
|
|||||||
* libwww-perl-5.803
|
* libwww-perl-5.803
|
||||||
* libxml2-2.6.26
|
* libxml2-2.6.26
|
||||||
* libxslt-1.1.17
|
* libxslt-1.1.17
|
||||||
* linux-2.6.27.31-ipfire
|
* linux-2.6.27.39-ipfire
|
||||||
* linux-2.6.27.31-ipfire-xen
|
|
||||||
* linux-atm-2.4.1
|
* linux-atm-2.4.1
|
||||||
* linux-libc-headers-2.6.12.0
|
* linux-libc-headers-2.6.12.0
|
||||||
* lm_sensors-3.0.3
|
* lm_sensors-3.0.3
|
||||||
@@ -201,11 +195,9 @@
|
|||||||
* lynis-1.2.6
|
* lynis-1.2.6
|
||||||
* lzo-2.02
|
* lzo-2.02
|
||||||
* m4-1.4.4
|
* m4-1.4.4
|
||||||
* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.31-ipfire
|
* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.39-ipfire
|
||||||
* mISDN.git-9bf7deaa4b8829ab8fbccb34529a17aab2ddea93-kmod-2.6.27.31-ipfire-xen
|
|
||||||
* mISDNuser.git-54928dec57bc846f2c2186f3640e69a053cd3641
|
* mISDNuser.git-54928dec57bc846f2c2186f3640e69a053cd3641
|
||||||
* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.31-ipfire
|
* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.39-ipfire
|
||||||
* madwifi-hal-0.10.5.6-r4031-20090529-kmod-2.6.27.31-ipfire-xen
|
|
||||||
* make-3.81
|
* make-3.81
|
||||||
* man-db-2.4.3
|
* man-db-2.4.3
|
||||||
* man-pages-2.34
|
* man-pages-2.34
|
||||||
@@ -253,8 +245,7 @@
|
|||||||
* openssh-5.2p1
|
* openssh-5.2p1
|
||||||
* openssl-0.9.8k
|
* openssl-0.9.8k
|
||||||
* openswan-2.6.23
|
* openswan-2.6.23
|
||||||
* openswan-2.6.23-kmod-2.6.27.31-ipfire
|
* openswan-2.6.23-kmod-2.6.27.39-ipfire
|
||||||
* openswan-2.6.23-kmod-2.6.27.31-ipfire-xen
|
|
||||||
* openvpn-2.1_rc20
|
* openvpn-2.1_rc20
|
||||||
* p7zip_4.65
|
* p7zip_4.65
|
||||||
* pam_mysql-0.7RC1
|
* pam_mysql-0.7RC1
|
||||||
@@ -275,12 +266,9 @@
|
|||||||
* procps-3.2.6
|
* procps-3.2.6
|
||||||
* psmisc-22.2
|
* psmisc-22.2
|
||||||
* qemu-0.11.0
|
* qemu-0.11.0
|
||||||
* r8101-kmod-2.6.27.31-ipfire
|
* r8101-kmod-2.6.27.39-ipfire
|
||||||
* r8101-kmod-2.6.27.31-ipfire-xen
|
* r8168-8.014.00-kmod-2.6.27.39-ipfire
|
||||||
* r8168-8.014.00-kmod-2.6.27.31-ipfire
|
* r8169-6.011.00-kmod-2.6.27.39-ipfire
|
||||||
* r8168-8.014.00-kmod-2.6.27.31-ipfire-xen
|
|
||||||
* r8169-6.011.00-kmod-2.6.27.31-ipfire
|
|
||||||
* r8169-6.011.00-kmod-2.6.27.31-ipfire-xen
|
|
||||||
* readline-5.1
|
* readline-5.1
|
||||||
* reiser4progs-1.0.5
|
* reiser4progs-1.0.5
|
||||||
* reiserfsprogs-3.6.19
|
* reiserfsprogs-3.6.19
|
||||||
@@ -335,8 +323,7 @@
|
|||||||
* urlgrabber-3.1.0
|
* urlgrabber-3.1.0
|
||||||
* usbutils-0.72
|
* usbutils-0.72
|
||||||
* util-linux-2.12r
|
* util-linux-2.12r
|
||||||
* v4l-dvb-bff77ec33116-kmod-2.6.27.31-ipfire
|
* v4l-dvb-bff77ec33116-kmod-2.6.27.39-ipfire
|
||||||
* v4l-dvb-bff77ec33116-kmod-2.6.27.31-ipfire-xen
|
|
||||||
* vdr-1.6.0
|
* vdr-1.6.0
|
||||||
* vdradmin-am-3.6.4
|
* vdradmin-am-3.6.4
|
||||||
* vim-7.0
|
* vim-7.0
|
||||||
|
|||||||
@@ -24,8 +24,8 @@
|
|||||||
|
|
||||||
include Config
|
include Config
|
||||||
|
|
||||||
PATCHLEVEL = .31
|
PATCHLEVEL = .39
|
||||||
VER = 2.6.27.31
|
VER = 2.6.27.39
|
||||||
|
|
||||||
THISAPP = linux-$(VER)
|
THISAPP = linux-$(VER)
|
||||||
DL_FILE = $(THISAPP).tar.bz2
|
DL_FILE = $(THISAPP).tar.bz2
|
||||||
@@ -35,7 +35,7 @@ CFLAGS =
|
|||||||
CXXFLAGS =
|
CXXFLAGS =
|
||||||
|
|
||||||
PROG = linux-xen
|
PROG = linux-xen
|
||||||
PAK_VER = 5
|
PAK_VER = 6
|
||||||
DEPS = ""
|
DEPS = ""
|
||||||
|
|
||||||
# Normal build or XEN build.
|
# Normal build or XEN build.
|
||||||
@@ -62,7 +62,7 @@ patch-2.6.16-nath323-1.3.bz2 = $(URL_IPFIRE)/patch-2.6.16-nath323-1.3.bz2
|
|||||||
squashfs3.4.tar.gz = $(URL_IPFIRE)/squashfs3.4.tar.gz
|
squashfs3.4.tar.gz = $(URL_IPFIRE)/squashfs3.4.tar.gz
|
||||||
reiser4-for-2.6.27.19.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2
|
reiser4-for-2.6.27.19.patch.bz2 = $(URL_IPFIRE)/reiser4-for-2.6.27.19.patch.bz2
|
||||||
|
|
||||||
$(DL_FILE)_MD5 = b066c348e0fbfa700399d62d2fdfbf11
|
$(DL_FILE)_MD5 = a1f935b170d9b63c0771a579b46c1123
|
||||||
netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5
|
netfilter-layer7-v2.21.tar.gz_MD5 = 838422e7d9a06b42e682e9064e5210b5
|
||||||
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
|
patch-2.6.16-nath323-1.3.bz2_MD5 = f926409ff703a307baf54b57ab75d138
|
||||||
squashfs3.4.tar.gz_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6
|
squashfs3.4.tar.gz_MD5 = 2a4d2995ad5aa6840c95a95ffa6b1da6
|
||||||
|
|||||||
Reference in New Issue
Block a user