Blacklist als new drm framebuffer modules.

[people/pmueller/ipfire-2.x.git] / lfs / linux

diff --git a/lfs/linux b/lfs/linux
index fe968720cb1a8b4432e222ddcd7a94bb98c927f4..34bddd8bc9e094370466e15c6e23c03e20b7dac3 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-PATCHLEVEL = .10
-VER        = 2.6.32.10
+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    = 10
 DEPS      = ""
 
 # Normal build or XEN build.
@@ -57,22 +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                         = 5d996507ad482a3a8c8e6b2d48e7994b
+$(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 = 96b0dc50256ced7c5c2b6d03a7f2d386
+xen-patches-2.6.32-2.tar.bz2_MD5       = d1d78d2e9b9b62dd869a490f4415de04
 
 install : $(TARGET)
 
@@ -108,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
-
-       # 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-2.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
@@ -128,9 +124,6 @@ else
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-imq-test2.patch
 endif
 
-       # Add patch to fix ath5k "no txbuf available"
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32-ath5k_fix_setup_for_CAB_queue.patch
-
        # Not report deprecated syscall 1.23 (for kudzu)
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.25.18-not_report_sysctl_1.23.patch
 
@@ -148,6 +141,16 @@ endif
        # Squashfs LZMA support
        cd $(DIR_APP) && bzcat $(DIR_DL)/squashfs-lzma-linux-2.6.32-kernel-patches.tar.bz2 | patch -Np1
 
+       # mISDN hfcusb fixes
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb_bchannels.patch
+
+       # 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
+
        # Cleanup kernel source
 
        cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config
@@ -185,5 +188,17 @@ endif
 #      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 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
+
+endif
+
        @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
        @$(POSTBUILD)