linux: Don't blacklist the DRM modules any more

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
index 88c5285579358dcac945f822f5341a15437e9bbc..ffd22d7a881c9493acde5eb159ffb52ade7a32e2 100644 (file)
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -573,7 +573,6 @@ boot/dtb-KVER
 #boot/dtb-KVER/synaptics/berlin4ct-stb.dtb
 boot/vmlinuz-KVER
 #etc/cpufreq-bench.conf
-etc/modprobe.d/framebuffer.conf
 etc/modprobe.d/ipv6.conf
 #lib/modules
 #lib/modules/KVER

diff --git a/config/rootfiles/common/riscv64/linux b/config/rootfiles/common/riscv64/linux
index e1b6c071c33a1aff533ea7c276fcdfcec61693cb..7681cf09a50e4268734122f2140c70db899ccbae 100644 (file)
--- a/config/rootfiles/common/riscv64/linux
+++ b/config/rootfiles/common/riscv64/linux
@@ -13,7 +13,6 @@ boot/dtb-KVER
 #boot/dtb-KVER/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb
 boot/vmlinuz-KVER
 #etc/cpufreq-bench.conf
-etc/modprobe.d/framebuffer.conf
 etc/modprobe.d/ipv6.conf
 #lib/modules
 #lib/modules/KVER

diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x86_64/linux
index aeb8ce71bae5d0f33fb57191c554ce9514a33b35..7ae6bbaae84d85093facb50a1c079dd7d6079d64 100644 (file)
--- a/config/rootfiles/common/x86_64/linux
+++ b/config/rootfiles/common/x86_64/linux
@@ -2,7 +2,6 @@ boot/System.map-KVER
 boot/config-KVER
 boot/vmlinuz-KVER
 #etc/cpufreq-bench.conf
-etc/modprobe.d/framebuffer.conf
 etc/modprobe.d/ipv6.conf
 #lib/modules
 #lib/modules/KVER

diff --git a/lfs/linux b/lfs/linux
index f1a436c034ba637047d62e43d68bd01e05d57292..15e279ca9d48c711a80c7b3899d48454cbf5ac7c 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -225,19 +225,6 @@ endif
        # Only do this once
        cd $(DIR_APP) && install -m 755 usr/gen_init_cpio /sbin/
 
-       # disable drm by install drm to /bin/false because i915 ignore blacklisting
-       echo install drm /bin/false > /etc/modprobe.d/framebuffer.conf
-
-       # Blacklist old framebuffer modules
-       for f in $$(find /lib/modules/$(KVER)/kernel/drivers/video/fbdev/ -name *.ko.xz); do \
-               echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \
-       done
-       # Blacklist new drm framebuffer modules
-       for f in $$(find /lib/modules/$(KVER)/kernel/drivers/gpu/drm -name *.ko.xz); do \
-               echo "blacklist $$(basename $$f)" >> /etc/modprobe.d/framebuffer.conf ; \
-       done
-       sed -i -e "s|.ko.xz||g" /etc/modprobe.d/framebuffer.conf
-
        # Disable ipv6 at runtime
        echo "options ipv6 disable_ipv6=1" > /etc/modprobe.d/ipv6.conf