From: arne_f <arne_f@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Sat, 8 Mar 2008 11:24:23 +0000 (+0000)
Subject: Add Plustek Parallelport scanner module to core10
X-Git-Tag: v2.3-beta1~155
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=85e27660840da15b104f4aa1156ae90a2ba23a18

Add Plustek Parallelport scanner module to core10


git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1259 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/config/rootfiles/core/10/files b/config/rootfiles/core/10/files
index f8cbcdf5bd..82441fdcd1 100644
--- a/config/rootfiles/core/10/files
+++ b/config/rootfiles/core/10/files
@@ -1,3 +1,5 @@
 usr/local/bin/wirelessctrl
 srv/web/ipfire/cgi-bin/optionsfw.cgi
 var/ipfire/langs
+lib/modules/2.6.16.57-ipfire/kernel/drivers/parport/pt_drv.ko
+lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/parport/pt_drv.ko
diff --git a/config/rootfiles/core/10/update.sh b/config/rootfiles/core/10/update.sh
index 35ee927e3d..3e4c5db788 100644
--- a/config/rootfiles/core/10/update.sh
+++ b/config/rootfiles/core/10/update.sh
@@ -3,3 +3,4 @@
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 extract_files
 perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+depmod -a
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 660ec76816..947c04f8f0 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -231,6 +231,7 @@
 * rtorrent-0.7.9
 * samba-3.0.28
 * sane-1.0.19
+* sane-1.0.19-kmod
 * screen-4.0.3
 * sdparm-1.01
 * sed-4.1.5
diff --git a/lfs/sane b/lfs/sane
index 02e1118349..742fc70dbf 100644
--- a/lfs/sane
+++ b/lfs/sane
@@ -30,7 +30,15 @@ THISAPP    = sane-$(VER)
 DL_FILE    = sane-backends-$(VER).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/sane-backends-$(VER)
+ifeq "$(KMOD)" "1"
+ifeq "$(SMP)" "1"
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-smp
+else
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod
+endif
+else
 TARGET     = $(DIR_INFO)/$(THISAPP)
+endif
 PROG       = sane
 PAK_VER    = 1
 
@@ -77,6 +85,21 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ifeq "$(KMOD)" "1"
+	cd $(DIR_APP)/doc/plustek && cp -vf Makefile.kernel26 \
+				$(DIR_APP)/backend/Makefile
+ifeq "$(SMP)" "1"
+	cd $(DIR_APP)/backend && make -C /lib/modules/$(KVER)-ipfire-smp/build/ \
+				    SUBDIRS=$(DIR_APP)/backend modules
+	cd $(DIR_APP)/backend && install -m 644 pt_drv.ko \
+	    /lib/modules/$(KVER)-ipfire-smp/kernel/drivers/parport/
+else
+	cd $(DIR_APP)/backend && make -C /lib/modules/$(KVER)-ipfire/build/ \
+				    SUBDIRS=$(DIR_APP)/backend modules
+	cd $(DIR_APP)/backend && install -m 644 pt_drv.ko \
+	    /lib/modules/$(KVER)-ipfire/kernel/drivers/parport/
+endif
+else
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
 				     --disable-ipv6 \
 				     --enable-parport-directio
@@ -89,6 +112,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	ln -sf ../init.d/sane /etc/rc.d/rc6.d/K10sane
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/sane  \
 			/var/ipfire/backup/addons/includes/sane
+endif
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
 	
\ No newline at end of file
diff --git a/make.sh b/make.sh
index ddf13c5bdc..0d123fbc25 100755
--- a/make.sh
+++ b/make.sh
@@ -326,9 +326,10 @@ buildipfire() {
   ipfiremake zaptel			SMP=1
   ipfiremake r8169			SMP=1
   ipfiremake r8168			SMP=1
-  ipfiremake mcs7830		SMP=1
-  ipfiremake atl1				SMP=1
+  ipfiremake mcs7830			SMP=1
+  ipfiremake atl1			SMP=1
   ipfiremake kqemu			SMP=1
+  ipfiremake sane		KMOD=1	SMP=1
   ipfiremake linux
   ipfiremake ipp2p
   ipfiremake zaptel
@@ -337,6 +338,7 @@ buildipfire() {
   ipfiremake mcs7830
   ipfiremake atl1
   ipfiremake kqemu
+  ipfiremake sane		KMOD=1
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio