include Config
-PATCHLEVEL = .11
-VER = 2.6.32.11
+PATCHLEVEL = .22
+VER = 2.6.32.22
THISAPP = linux-$(VER)
DL_FILE = $(THISAPP).tar.bz2
CXXFLAGS =
PROG = linux-xen
-PAK_VER = 8
+PAK_VER = 12
DEPS = ""
# Normal build or XEN build.
netfilter-layer7-v2.22.tar.gz \
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-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
-linux-$(VER)-suse_xen_patches-1.tar.bz2 = $(URL_IPFIRE)/linux-$(VER)-suse_xen_patches-1.tar.bz2
+xen-patches-2.6.32-2c.tar.bz2 = $(URL_IPFIRE)/xen-patches-2.6.32-2c.tar.bz2
-
-$(DL_FILE)_MD5 = 3709c691d909b4f8ca692edc6c726cb6
+$(DL_FILE)_MD5 = c53844ab98703777b0546b5061606a47
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 = cf3620071cbb37081b366e79bb438fb0
+xen-patches-2.6.32-2c.tar.bz2_MD5 = 62a75ddcba43894b20f754a94b299ce6
install : $(TARGET)
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
-
- # Fix strange patchset errors
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.8-xen-patch-fixes.patch
+ # Apply gentoo Xen patches
+ mkdir -p $(DIR_SRC)/xen-patches
+ 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]"; \
+ cd $(DIR_APP) && pwd && patch -Np1 < $$x || exit 1; \
+ 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
cd $(DIR_SRC) && tar xzf $(DIR_DL)/netfilter-layer7-v2.22.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/netfilter-layer7-v2.22/kernel-2.6.25-2.6.28-layer7-2.22.patch
- # Squashfs LZMA support
- cd $(DIR_APP) && bzcat $(DIR_DL)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 | patch -Np1
+ # Add some more LED triggers
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.11-netdev-1.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
# Cleanup kernel source
cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
endif
- # Rename ide-cd module to match with old kernel
- mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd_mod.ko \
- /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-cd.ko
- mv /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-gd_mod.ko \
- /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/ide/ide-disk.ko
-
-# # Remove mISDN modules
-# rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
-# rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
+ # Remove mISDN modules
+ rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/mISDN
+ rm -rvf /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn/hardware/mISDN
+
+ifneq "$(XEN)" "1"
+ # Blacklist matroxfb_base
+ echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer
+ # Blacklist old framebuffer modules
+ for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video -name *fb.ko); do \
+ echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \
+ done
+ # Blacklist new drm framebuffer modules
+ for f in $$(ls -1 /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm/*/*.ko); do \
+ echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer ; \
+ done
+ sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer
+
+ # Blacklist isdn modules
+ for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/isdn -name *.ko); do \
+ echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/isdn ; \
+ done
+ sed -i -e "s|.ko||g" /etc/modprobe.d/isdn
+endif
@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
@$(POSTBUILD)