From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 2 Dec 2017 09:44:09 +0000 (+0100)
Subject: kernel: update generating of fb and drm blacklist
X-Git-Tag: v2.21-core122~178^2~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e31045ee126a71dd34d927bef0d919e4d0d50dd4;p=ipfire-2.x.git

kernel: update generating of fb and drm blacklist

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/linux b/lfs/linux
index e3c4c39809..92f400976e 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -231,16 +231,14 @@ ifeq "$(LASTKERNEL)" "1"
 	# Only do this once
 	cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
 
-	# Blacklist matroxfb_base
-	echo "blacklist matroxfb_base" >> /etc/modprobe.d/framebuffer.conf
 	# Blacklist old framebuffer modules
-	for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video -name *fb.ko); do \
+	for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/video/fbdev/ -name *.ko); do \
 		echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \
 	done
 	# Blacklist new drm framebuffer modules
-	for f in $$(ls -1 /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm/*/*.ko); do \
+	for f in $$(find /lib/modules/$(VER)-$(VERSUFIX)/kernel/drivers/gpu/drm -name *.ko); do \
 		echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \
-	done
+	done	
 	sed -i -e "s|.ko||g" /etc/modprobe.d/framebuffer.conf
 
 	# Blacklist isdn modules