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 f8cbcdf5bd9086d59f7fbb856975dbd725625cf2..82441fdcd1a67a3702fbd173d16a3f793a13e52c 100644 (file)
--- 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 35ee927e3de7551b03ae677bf27a369a96978d9a..3e4c5db7887485ca2fb39b0e52c5ddb0688b3aa8 100644 (file)
--- 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 660ec76816c029d85cc5a1121f67db3b1fecc943..947c04f8f014ebd3fde31230503f0a5438752edd 100644 (file)
--- 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 02e111834990b5618e80ddf2d8c0a2dd1f41a4a6..742fc70dbf39dfdce4249db8d72295c7bc111195 100644 (file)
--- 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 ddf13c5bdc7f39f1f9a841691a5614b548a53d2d..0d123fbc25289f6701fbd709d976feeb0ac98c01 100755 (executable)
--- 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