Updated Kernel (2.6.32.15).

Now use gentoo xen-patchset.
This commit is contained in:
Arne Fitzenreiter
2010-06-03 19:04:29 +02:00
parent 870eb6a2bb
commit de167abd56
11 changed files with 47 additions and 2112 deletions

View File

@@ -3,8 +3,7 @@ boot/System.map-ipfire
boot/config-KVER-ipfire
boot/vmlinuz-KVER-ipfire
boot/vmlinuz-ipfire
#lib/firmware/bnx2x-e1-5.0.21.0.fw
#lib/firmware/bnx2x-e1h-5.0.21.0.fw
#lib/firmware/keyspan/usa19qi.fw
lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/build
#lib/modules/KVER-ipfire/kernel

View File

@@ -281,11 +281,5 @@ lib/firmware/yamaha/ds1_ctrl.fw
lib/firmware/yamaha/ds1_dsp.fw
lib/firmware/yamaha/ds1e_ctrl.fw
lib/firmware/yamaha/yss225_registers.bin
lib/firmware/bnx2/bnx2-mips-06-5.0.0.j6.fw
lib/firmware/bnx2/bnx2-mips-09-5.0.0.j9.fw
lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j10.fw
lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw
lib/firmware/bnx2x-e1-5.0.21.0.fw
lib/firmware/bnx2x-e1-5.2.13.0.fw
lib/firmware/bnx2x-e1h-5.0.21.0.fw
lib/firmware/bnx2x-e1h-5.2.13.0.fw

View File

@@ -24,7 +24,7 @@
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
#
KVER="2.6.32.12"
KVER="2.6.32.15"
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
@@ -66,9 +66,11 @@ 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
# Don't remove all old xen modules. Kernel may stored outside.
# only from 2.6.27.25 and 31
rm -rf /lib/modules/2.6.27.25-ipfire-xen
rm -rf /lib/modules/2.6.27.31-ipfire-xen
#
# remove openswan libs ...
#

View File

@@ -3,12 +3,13 @@ boot/System.map-ipfire-xen
boot/config-KVER-ipfire-xen
boot/vmlinuz-KVER-ipfire-xen
boot/vmlinuz-ipfire-xen
#lib/firmware/bnx2/bnx2-mips-06-5.0.0.j6.fw
#lib/firmware/bnx2/bnx2-mips-09-5.0.0.j9.fw
#lib/firmware/bnx2/bnx2-rv2p-09-5.0.0.j10.fw
#lib/firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw
#lib/firmware/bnx2x-e1-5.2.13.0.fw
#lib/firmware/bnx2x-e1h-5.2.13.0.fw
#lib/firmware/bnx2x-e1-5.0.21.0.fw
#lib/firmware/bnx2x-e1h-5.0.21.0.fw
#lib/firmware/keyspan/usa18x.fw
#lib/firmware/keyspan/usa19.fw
#lib/firmware/mts_cdma.fw
#lib/firmware/radeon/RV610_me.bin
#lib/firmware/ti_5052.fw
#lib/modules
lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/build
@@ -586,15 +587,12 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/md
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-crypt.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-delay.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-least-pending.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-log-userspace.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-log.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-memcache.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-mirror.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-mod.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-multipath.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-queue-length.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-raid45.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-region-hash.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-round-robin.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/md/dm-service-time.ko
@@ -1010,7 +1008,6 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/hp-wmi.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/intel_menlow.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/msi-laptop.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/msi-wmi.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/panasonic-laptop.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/sony-laptop.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/platform/x86/tc1100-wmi.ko
@@ -1102,7 +1099,6 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fnic
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/fnic/fnic.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/gdth.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/hpsa.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/hptiop.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/imm.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/scsi/initio.ko
@@ -1413,7 +1409,7 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/watchdog/wm8350_wdt.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/xen
#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/blktap2
#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/blktap2/blktap2.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/blktap2/blktap.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/scsiback
#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/scsiback/xen-scsibk.ko
#lib/modules/KVER-ipfire-xen/kernel/drivers/xen/scsifront
@@ -1569,7 +1565,6 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ah.ko
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ecn.ko
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ipp2p.ko
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/ipt_ipv4options.ko
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/iptable_filter.ko
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/iptable_mangle.ko
#lib/modules/KVER-ipfire-xen/kernel/net/ipv4/netfilter/iptable_nat.ko
@@ -1634,7 +1629,6 @@ lib/modules/KVER-ipfire-xen
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_proto_udplite.ko
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_sane.ko
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_sip.ko
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_slp.ko
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_conntrack_tftp.ko
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nf_tproxy_core.ko
#lib/modules/KVER-ipfire-xen/kernel/net/netfilter/nfnetlink.ko

View File

@@ -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.12-ipfire
* alsa-lib-1.0.23-kmod-2.6.32.15-ipfire
* amavisd-new-2.5.2
* apcupsd-3.14.4
* applejuice-0.31
@@ -68,20 +68,20 @@
* clamav-0.96.1
* cmake-2.4.8
* collectd-4.9.1
* compat-wireless-2.6.34-kmod-2.6.32.12-ipfire
* compat-wireless-2.6.34-kmod-2.6.32.12-ipfire-xen
* compat-wireless-2.6.34-kmod-2.6.32.15-ipfire
* compat-wireless-2.6.34-kmod-2.6.32.15-ipfire-xen
* coreutils-5.96
* cpio-2.6
* cpufrequtils-007
* cryptodev-20091126-kmod-2.6.32.12-ipfire
* cryptodev-20091126-kmod-2.6.32.12-ipfire-xen
* cryptodev-20091126-kmod-2.6.32.15-ipfire
* cryptodev-20091126-kmod-2.6.32.15-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.12-ipfire
* dahdi-2.2.1-kmod-2.6.32.12-ipfire-xen
* dahdi-2.2.1-kmod-2.6.32.15-ipfire
* dahdi-2.2.1-kmod-2.6.32.15-ipfire-xen
* db-4.4.20
* dbus-1.0.3
* dhcp-3.1.0
@@ -158,10 +158,10 @@
* jpegsrc.v6b
* kbd-1.12
* klibc-1.5.14
* kqemu-1.4.0pre1-kmod-2.6.32.12-ipfire
* kqemu-1.4.0pre1-kmod-2.6.32.12-ipfire-xen
* kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire
* kqemu-1.4.0pre1-kmod-2.6.32.15-ipfire-xen
* kudzu-1.2.64
* kvm-kmod-2.6.33.1-kmod-2.6.32.12-ipfire
* kvm-kmod-2.6.33.1-kmod-2.6.32.15-ipfire
* l7-protocols-2009-05-10
* lame-3.97
* lcd4linux-0.10.1-RC2
@@ -193,8 +193,8 @@
* libwww-perl-5.803
* libxml2-2.6.26
* libxslt-1.1.17
* linux-2.6.32.12-ipfire
* linux-2.6.32.12-ipfire-xen
* linux-2.6.32.15-ipfire
* linux-2.6.32.15-ipfire-xen
* linux-atm-2.4.1
* linux-firmware-20100318
* linux-libc-headers-2.6.12.0
@@ -206,8 +206,8 @@
* lzo-2.02
* m4-1.4.4
* mISDNuser_20090906
* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.12-ipfire
* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.12-ipfire-xen
* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.15-ipfire
* madwifi-hal-0.10.5.6-r4119-20100201-kmod-2.6.32.15-ipfire-xen
* make-3.81
* man-db-2.4.3
* man-pages-2.34
@@ -254,7 +254,7 @@
* openldap-2.3.20
* openmailadmin-1.0.0
* openssh-5.4p1
* openssl-0.9.8n
* openssl-0.9.8o
* openvpn-2.1.1
* p7zip_4.65
* pam_mysql-0.7RC1
@@ -331,8 +331,8 @@
* usb-modeswitch-1.1.2
* usbutils-0.72
* util-linux-2.12r
* v4l-dvb-b576509ea6d2-kmod-2.6.32.12-ipfire
* v4l-dvb-b576509ea6d2-kmod-2.6.32.12-ipfire-xen
* v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire
* v4l-dvb-b576509ea6d2-kmod-2.6.32.15-ipfire-xen
* vdr-1.6.0
* vdradmin-am-3.6.5
* vim-7.0

View File

@@ -77,10 +77,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
ifeq "$(XEN)" "1"
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.34-xen.patch
endif
# Enable some USB ID's in rt2800usb driver
echo "CONFIG_RT2800USB_RT30XX=y" >> $(DIR_APP)/config.mk
echo "CONFIG_RT2800USB_RT35XX=y" >> $(DIR_APP)/config.mk

View File

@@ -24,8 +24,8 @@
include Config
PATCHLEVEL = .12
VER = 2.6.32.12
PATCHLEVEL = .15
VER = 2.6.32.15
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -35,7 +35,7 @@ CFLAGS =
CXXFLAGS =
PROG = linux-xen
PAK_VER = 8
PAK_VER = 9
DEPS = ""
# Normal build or XEN build.
@@ -57,23 +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 \
linux-$(VER)-suse_xen_patches-1.tar.bz2
xen-patches-2.6.32-2.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
linux-$(VER)-suse_xen_patches-1.tar.bz2 = $(URL_IPFIRE)/linux-$(VER)-suse_xen_patches-1.tar.bz2
xen-patches-2.6.32-2.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2.tar.bz2
$(DL_FILE)_MD5 = bc87db696ed4be729334584493d6d98d
$(DL_FILE)_MD5 = 1cbbf16e93bbe03368172872690600c0
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
linux-$(VER)-suse_xen_patches-1.tar.bz2_MD5 = e568ec5d8e65a4b0f2008d67f30198bb
xen-patches-2.6.32-2.tar.bz2_MD5 = d1d78d2e9b9b62dd869a490f4415de04
install : $(TARGET)
@@ -109,18 +107,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
ln -s linux-$(VER) /usr/src/linux
ifeq "$(XEN)" "1"
# Apply Xen patches (provided by SuSE)
cd $(DIR_SRC) && tar jxf $(DIR_DL)/linux-$(VER)-suse_xen_patches-1.tar.bz2
cp -f $(DIR_SRC)/src/patches/suse_xen_series.conf $(DIR_SRC)/linux-$(VER)-suse_xen_patches/series.conf
cd $(DIR_SRC)/linux-$(VER)-suse_xen_patches && \
for x in $$( ./guards $$( ./arch-symbols) < ./series.conf); do \
echo "*********** [Patch: $$x]"; \
patch -d $(DIR_APP) -p1 < $$x || break; \
done
rm -rf $(DIR_SRC)/linux-*-suse_xen_patches
# Apply gentoo Xen patches
mkdir -p $(DIR_SRC)/xen-patches
cd $(DIR_SRC)/xen-patches && tar jxf $(DIR_DL)/xen-patches-2.6.32-2.tar.bz2
# Fix strange patchset errors
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-xen-patch-fixes.patch
for x in `find $(DIR_SRC)/xen-patches/ -type f`; do \
echo "*********** [Patch: $$x]"; \
patch -d $(DIR_APP) -p1 < $$x || break; \
done
rm -rf $(DIR_SRC)/xen-patches
# Linux Intermediate Queueing Device
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-xen-imq-test2.patch

View File

@@ -24,7 +24,7 @@
. /opt/pakfire/lib/functions.sh
extract_files
#
KVER=2.6.32.12
KVER=2.6.32.15
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

View File

@@ -1,20 +0,0 @@
diff -Naur compat-wireless-2.6.34.org/include/linux/compat-2.6.33.h compat-wireless-2.6.34/include/linux/compat-2.6.33.h
--- compat-wireless-2.6.34.org/include/linux/compat-2.6.33.h 2010-05-18 03:11:59.000000000 +0200
+++ compat-wireless-2.6.34/include/linux/compat-2.6.33.h 2010-05-27 19:58:55.000000000 +0200
@@ -60,16 +60,6 @@
/* this will never happen on older kernels */
#define NETDEV_POST_INIT 0xffff
-static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev,
- unsigned int length)
-{
- struct sk_buff *skb = netdev_alloc_skb(dev, length + NET_IP_ALIGN);
-
- if (NET_IP_ALIGN && skb)
- skb_reserve(skb, NET_IP_ALIGN);
- return skb;
-}
-
#if defined(CONFIG_PCCARD) || defined(CONFIG_PCCARD_MODULE)
#if defined(CONFIG_PCMCIA) || defined(CONFIG_PCMCIA_MODULE)

View File

@@ -1,13 +0,0 @@
diff -Naur linux-2.6.32.8.org/init/main.c linux-2.6.32.8/init/main.c
--- linux-2.6.32.8.org/init/main.c 2010-02-17 20:30:17.000000000 +0100
+++ linux-2.6.32.8/init/main.c 2010-02-17 22:00:48.000000000 +0100
@@ -90,9 +90,6 @@
extern void prio_tree_init(void);
extern void radix_tree_init(void);
extern void free_initmem(void);
-#ifndef CONFIG_DEBUG_RODATA
-static inline void mark_rodata_ro(void) { }
-#endif
#ifdef CONFIG_TC
extern void tc_init(void);

File diff suppressed because it is too large Load Diff