3.8.0-alt1

.gitignore

 etercifs/test.sh
+etercifs/Makefile
 

etercifs.spec

@@ -70,19 +70,19 @@ This package has Etersoft's patches for WINE@Etersoft sharing access support.
 %setup -q
 
 %install
+mkdir -p %buildroot%_sysconfdir
+echo DATADIR=%_datadir/%name > %buildroot%_sysconfdir/%name.conf
+echo SRC_DIR=%_usrsrc/%name-%version >> %buildroot%_sysconfdir/%name.conf
+echo MODULENAME=%name >> %buildroot%_sysconfdir/%name.conf
+echo MODULEVERSION=%version >> %buildroot%_sysconfdir/%name.conf
+
 mkdir -p %buildroot%_datadir/%name
 install -m644 buildmodule.sh %buildroot%_datadir/%name
-sed -e "s|@DATADIR@|%_datadir/%name|g" < functions.sh.init > functions.sh.init.repl
-sed -e "s|@SRC_DIR@|%_usrsrc/%name-%version|g" < functions.sh.init > functions.sh.init.repl
-sed -e "s|@MODULENAME@|%name|g" < functions.sh.init > functions.sh.init.repl
-sed -e "s|@MODULEVERSION@|%version|g" < functions.sh.init > functions.sh.init.repl
-install -m644 functions.sh.init.repl %buildroot%_datadir/%name/functions.sh
+install -m644 functions.sh %buildroot%_datadir/%name
 
 mkdir -p %buildroot%_initdir
-sed -e "s|@DATADIR@|%_datadir/%name|g" < %name.init > %name.init.repl
-sed -e "s|@SRC_DIR@|%_usrsrc/%name-%version|g" < %name.init > %name.init.repl
-install -m755 %name.init.repl %buildroot%_initdir/%name
-install -m755 %name.outformat %buildroot%_initdir/%name.outformat
+install -m755 %name %buildroot%_initdir
+install -m755 %name.outformat %buildroot%_initdir
 
 %define etercifs_src %_datadir/%name/sources
 
@@ -105,13 +105,15 @@ cp %SOURCE27 %buildroot/%etercifs_src/%src_package_name-2.6.27-%src_2_6_27_versi
 %preun_service %name
 
 %files
+%config(noreplace) %_sysconfdir/%name.conf
 %_datadir/%name
 %_initdir/%name
 %_initdir/%name.outformat
 
 %changelog
 * Thu Nov 06 2008 Konstantin Baev <kipruss@altlinux.org> 3.8.0-alt1
-- Fix building module with dkms
+- fix building module with dkms
+- add config file /etc/etercifs.conf
 
 * Wed Nov 05 2008 Konstantin Baev <kipruss@altlinux.org> 3.7.0-alt2
 - delete last change (building module on installing rpm)

etercifs/etercifs.init → etercifs/etercifs

@@ -15,10 +15,16 @@
 RMMOD=/sbin/rmmod
 MODPROBE=/sbin/modprobe
 INSMOD=/sbin/insmod
-SRC_DIR=@SRC_DIR@
+
+if [ -f /etc/etercifs.conf ] ; then
+  . /etc/etercifs.conf
+fi
+
+[ -n "$SRC_DIR" ] || SRC_DIR=/usr/src
+[ -n "$DATADIR" ] || DATADIR=/usr/share/etercifs
+[ -n "$MODULENAME" ] || MODULENAME=etercifs
 
 ORIGMODULENAME=cifs
-MODULENAME=etercifs
 
 OUTFORMAT=/etc/init.d/outformat
 [ -x $OUTFORMAT ] || OUTFORMAT=/etc/init.d/etercifs.outformat
@@ -160,17 +166,17 @@ status()
 build_module()
 {
     if [ -r $SRC_DIR/dkms.conf ] ; then
-        cd @DATADIR@
+        cd $DATADIR
         DKMSBUILD=1 sh buildmodule.sh
     else
-        cd @DATADIR@
+        cd $DATADIR
         sh buildmodule.sh
     fi
 }
 
 test_build_module()
 {
-    cd @DATADIR@
+    cd $DATADIR
     TESTBUILD=1 sh buildmodule.sh
 }
 

etercifs/functions.sh.init → etercifs/functions.sh

@@ -7,11 +7,13 @@
 
 # Build kernel modules for all kernel and all platforms
 
-MODULENAME=@MODULENAME@
-MODULEVERSION=@MODULEVERSION@
-MODULEFILENAME=etercifs.ko
-SRC_DIR=@SRC_DIR@
+if [ -f /etc/etercifs.conf ] ; then
+  . /etc/etercifs.conf
+else
+  fatal "Not found configuration file /etc/etercifs.conf"
+fi
 
+MODULEFILENAME=etercifs.ko
 [ -n "$TESTBUILD" ] || TESTBUILD=0
 [ -n "$DKMSBUILD" ] || DKMSBUILD=0
 
@@ -31,7 +33,7 @@ exit_handler()
 
 detect_etercifs_sources()
 {
-    [ -n "$ETERCIFS_SOURCES_LIST" ] || ETERCIFS_SOURCES_LIST=@DATADIR@/sources/kernel-source-etercifs*
+    [ -n "$ETERCIFS_SOURCES_LIST" ] || ETERCIFS_SOURCES_LIST=$DATADIR/sources/kernel-source-etercifs*
     [ -n "`ls $ETERCIFS_SOURCES_LIST`" ] || fatal "Etercifs kernel module sources does not installed!"
     KERNEL_SOURCE_ETERCIFS_LINK=`ls -1 $ETERCIFS_SOURCES_LIST | grep $KERNEL | sort -r | head -n 1`
     KERNEL_SOURCE_ETERCIFS=`readlink -f $KERNEL_SOURCE_ETERCIFS_LINK`
@@ -138,6 +140,7 @@ dkms_build_module()
     DIRNAME=${FILENAME%.tar.bz2}
     mv -f $SRC_DIR/$DIRNAME/* $SRC_DIR
     rm -rf $SRC_DIR/$DIRNAME
+    dkms uninstall -m $MODULENAME -v $MODULEVERSION --rpm_safe_upgrade
     dkms build -m $MODULENAME -v $MODULEVERSION --rpm_safe_upgrade
     dkms install -m $MODULENAME -v $MODULEVERSION --rpm_safe_upgrade
 }