Removed .ko from framebuffer blacklist.

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

diff --git a/lfs/linux b/lfs/linux
index b77c560c11d3af70dfbf45d6f034b17e59ff1272..68e7df44f7a1dffff50301d7aca517e4e1d64822 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -35,7 +35,7 @@ CFLAGS     =
 CXXFLAGS   =
 
 PROG      = linux-xen
-PAK_VER    = 9
+PAK_VER    = 10
 DEPS      = ""
 
 # Normal build or XEN build.
@@ -111,9 +111,9 @@ ifeq "$(XEN)" "1"
        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 `find $(DIR_SRC)/xen-patches/ -type f`; do \
+       for x in `ls -1 $(DIR_SRC)/xen-patches/*.patch1`; do \
                echo "*********** [Patch: $$x]"; \
-               patch -d $(DIR_APP) -p1 < $$x || break; \
+               cd $(DIR_APP) && pwd && patch -Np1 < $$x || exit 1; \
        done
        rm -rf $(DIR_SRC)/xen-patches
 
@@ -188,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
+       sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer
+endif
+
        @rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs* $(DIR_SRC)/netfilter-layer7-*
        @$(POSTBUILD)