From bed16d4f435080044546380850b27ede31355ff5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 15 Aug 2010 21:24:04 +0200 Subject: [PATCH] Update Kernel (2.6.32.18). --- doc/packages-list.txt | 54 +++++++++++++++++------------------ lfs/linux | 17 +++++------ src/paks/linux-xen/install.sh | 2 +- 3 files changed, 35 insertions(+), 38 deletions(-) diff --git a/doc/packages-list.txt b/doc/packages-list.txt index f646d55c84..e281e50788 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -37,7 +37,7 @@ * Unix-Syslog-0.100 * XML-Parser-2.34 * alsa-lib-1.0.23 -* alsa-lib-1.0.23-kmod-2.6.32.18-ipfire +* alsa-lib-1.0.23-kmod-2.6.32.19-ipfire * amavisd-new-2.5.2 * apcupsd-3.14.4 * applejuice-0.31 @@ -67,20 +67,20 @@ * clamav-0.96.1 * cmake-2.4.8 * collectd-4.9.1 -* compat-wireless-2.6.35-1-kmod-2.6.32.18-ipfire -* compat-wireless-2.6.35-1-kmod-2.6.32.18-ipfire-xen +* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire +* compat-wireless-2.6.35-1-kmod-2.6.32.19-ipfire-xen * coreutils-5.96 * cpio-2.11 * cpufrequtils-007 -* cryptodev-20091126-kmod-2.6.32.18-ipfire -* cryptodev-20091126-kmod-2.6.32.18-ipfire-xen +* cryptodev-20091126-kmod-2.6.32.19-ipfire +* cryptodev-20091126-kmod-2.6.32.19-ipfire-xen * cups-1.4.2 * curl-7.19.5 * cyrus-imapd-2.2.12 * cyrus-sasl-2.1.21 * dahdi-2.2.1 -* dahdi-2.2.1-kmod-2.6.32.18-ipfire -* dahdi-2.2.1-kmod-2.6.32.18-ipfire-xen +* dahdi-2.2.1-kmod-2.6.32.19-ipfire +* dahdi-2.2.1-kmod-2.6.32.19-ipfire-xen * db-4.4.20 * dbus-1.0.3 * ddrescue-1.12 @@ -90,10 +90,10 @@ * dnsmasq-2.45 * dosfstools-3.0.9 * dracut-006 -* e1000-8.0.19-kmod-2.6.32.18-ipfire -* e1000-8.0.19-kmod-2.6.32.18-ipfire-xen -* e1000e-1.1.19-kmod-2.6.32.18-ipfire -* e1000e-1.1.19-kmod-2.6.32.18-ipfire-xen +* e1000-8.0.19-kmod-2.6.32.19-ipfire +* e1000-8.0.19-kmod-2.6.32.19-ipfire-xen +* e1000e-1.1.19-kmod-2.6.32.19-ipfire +* e1000e-1.1.19-kmod-2.6.32.19-ipfire-xen * e2fsprogs-1.41.11 * ebtables-v2.0.8-2 * ed-0.2 @@ -162,8 +162,8 @@ * joe-3.7 * jpegsrc.v6b * kbd-1.12 -* kqemu-1.4.0pre1-kmod-2.6.32.18-ipfire -* kqemu-1.4.0pre1-kmod-2.6.32.18-ipfire-xen +* kqemu-1.4.0pre1-kmod-2.6.32.19-ipfire +* kqemu-1.4.0pre1-kmod-2.6.32.19-ipfire-xen * kudzu-1.2.64 * l7-protocols-2009-05-10 * lame-3.97 @@ -197,8 +197,8 @@ * libwww-perl-5.803 * libxml2-2.6.26 * libxslt-1.1.17 -* linux-2.6.32.18-ipfire -* linux-2.6.32.18-ipfire-xen +* linux-2.6.32.19-ipfire +* linux-2.6.32.19-ipfire-xen * linux-atm-2.4.1 * linux-firmware-20100318 * linux-libc-headers-2.6.12.0 @@ -209,11 +209,11 @@ * lynis-1.2.9 * lzo-2.02 * m4-1.4.4 -* mISDN-20100525-kmod-2.6.32.18-ipfire -* mISDN-20100525-kmod-2.6.32.18-ipfire-xen +* mISDN-20100525-kmod-2.6.32.19-ipfire +* mISDN-20100525-kmod-2.6.32.19-ipfire-xen * mISDNuser-20100525 -* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.18-ipfire -* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.18-ipfire-xen +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.19-ipfire +* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.19-ipfire-xen * make-3.81 * man-db-2.4.3 * man-pages-2.34 @@ -282,12 +282,12 @@ * psmisc-22.2 * qemu-0.11.1-kqemu * qemu-0.12.3 -* r8101-1.016.00-kmod-2.6.32.18-ipfire -* r8101-1.016.00-kmod-2.6.32.18-ipfire-xen -* r8168-8.018.00-kmod-2.6.32.18-ipfire -* r8168-8.018.00-kmod-2.6.32.18-ipfire-xen -* r8169-6.013.00-kmod-2.6.32.18-ipfire -* r8169-6.013.00-kmod-2.6.32.18-ipfire-xen +* r8101-1.016.00-kmod-2.6.32.19-ipfire +* r8101-1.016.00-kmod-2.6.32.19-ipfire-xen +* r8168-8.018.00-kmod-2.6.32.19-ipfire +* r8168-8.018.00-kmod-2.6.32.19-ipfire-xen +* r8169-6.013.00-kmod-2.6.32.19-ipfire +* r8169-6.013.00-kmod-2.6.32.19-ipfire-xen * readline-5.1 * reiser4progs-1.0.6 * reiserfsprogs-3.6.21 @@ -343,8 +343,8 @@ * usb-modeswitch-data-20100707 * usbutils-0.72 * util-linux-2.12r -* v4l-dvb-b576509ea6d2-kmod-2.6.32.18-ipfire -* v4l-dvb-b576509ea6d2-kmod-2.6.32.18-ipfire-xen +* v4l-dvb-b576509ea6d2-kmod-2.6.32.19-ipfire +* v4l-dvb-b576509ea6d2-kmod-2.6.32.19-ipfire-xen * vdr-1.6.0 * vdradmin-am-3.6.7 * vim-7.0 diff --git a/lfs/linux b/lfs/linux index f6799d0a1e..c848e58791 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,8 +24,8 @@ include Config -PATCHLEVEL = .18 -VER = 2.6.32.18 +PATCHLEVEL = .19 +VER = 2.6.32.19 THISAPP = linux-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -57,21 +57,21 @@ objects =$(DL_FILE) \ patch-2.6.16-nath323-1.3.bz2 \ reiser4-for-2.6.32.patch.bz2 \ squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 \ - xen-patches-2.6.32-2b.tar.bz2 + xen-patches-2.6.32-2c.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 squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 = $(URL_IPFIRE)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 -xen-patches-2.6.32-2b.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2a.tar.bz2 +xen-patches-2.6.32-2c.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2a.tar.bz2 -$(DL_FILE)_MD5 = 8c8b82d4bf607ddb233deaf7f1c44f0f +$(DL_FILE)_MD5 = 7f32112095a164e1330c07be72966ccb 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 squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2_MD5 = d2a84311081023c7ffd28cdca67c45d4 -xen-patches-2.6.32-2b.tar.bz2_MD5 = a1798dc2de1ce4329c9580730f6c0096 +xen-patches-2.6.32-2c.tar.bz2_MD5 = 62a75ddcba43894b20f754a94b299ce6 install : $(TARGET) @@ -109,7 +109,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-2b.tar.bz2 + cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2c.tar.bz2 for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \ echo "*********** [Patch: $$x]"; \ @@ -144,9 +144,6 @@ endif # Add some more LED triggers cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netdev-1.patch - # Huawei (Vodafone) K3765 & K4505 Usbids - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-option_add_vodafone_usbids.patch - # Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh index 4313f23505..68c36ea006 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.18 +KVER=2.6.32.19 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 -- 2.39.2