From 2beee0e4c8c648ae61d7de5f05e82b5910e219a5 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Mon, 21 Apr 2008 20:48:32 +0200 Subject: [PATCH] Moved fusion module to misc and disabled it as default --- config/rootfiles/core/12/files | 4 ++-- config/rootfiles/core/12/update.sh | 1 - config/vdr/bin/runvdr-soft | 2 +- lfs/linux-fusion | 1 + src/initscripts/sysconfig/modules | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/core/12/files b/config/rootfiles/core/12/files index 7c4b2946e6..c0e0d9d468 100644 --- a/config/rootfiles/core/12/files +++ b/config/rootfiles/core/12/files @@ -126,8 +126,8 @@ lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/compat_ioctl32.ko lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/videodev.ko lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/v4l1-compat.ko lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/v4l2-common.ko -lib/modules/2.6.16.57-ipfire/drivers/char/fusion/fusion.ko -lib/modules/2.6.16.57-ipfire-smp/drivers/char/fusion/fusion.ko +lib/modules/2.6.16.57-ipfire/misc/drivers/char/fusion/fusion.ko +lib/modules/2.6.16.57-ipfire-smp/misc/drivers/char/fusion/fusion.ko etc/udev/dvb.sh etc/udev/rules.d/10-dvb.rules srv/web/ipfire/cgi-bin/services.cgi diff --git a/config/rootfiles/core/12/update.sh b/config/rootfiles/core/12/update.sh index e6334cb15b..3e4c5db788 100644 --- a/config/rootfiles/core/12/update.sh +++ b/config/rootfiles/core/12/update.sh @@ -4,4 +4,3 @@ extract_files perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" depmod -a -modprobe fusion diff --git a/config/vdr/bin/runvdr-soft b/config/vdr/bin/runvdr-soft index 8459df8dd1..dd51c0b9e1 100755 --- a/config/vdr/bin/runvdr-soft +++ b/config/vdr/bin/runvdr-soft @@ -1,3 +1,3 @@ #!/bin/sh clear -runvdr -Psoftdevice > /dev/null 2>&1 +runvdr -P\'softdevice -vo fb:\' > /dev/null 2>&1 diff --git a/lfs/linux-fusion b/lfs/linux-fusion index bde3c05d9a..693412e3cf 100644 --- a/lfs/linux-fusion +++ b/lfs/linux-fusion @@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && sed -i "s@MODLIB)/drivers@MODLIB)/misc/drivers@g" Makefile ifeq "$(SMP)" "1" cd $(DIR_APP) && sed -i "s/\x24(shell uname -r)/$(KVER)-ipfire-smp/g" Makefile cd $(DIR_APP) && make diff --git a/src/initscripts/sysconfig/modules b/src/initscripts/sysconfig/modules index 11ae443210..5f8a77d8b1 100644 --- a/src/initscripts/sysconfig/modules +++ b/src/initscripts/sysconfig/modules @@ -31,6 +31,6 @@ parport_pc lp ### fusion -fusion +# fusion # End /etc/sysconfig/modules -- 2.39.5