3.7.0-alt2

etercifs.spec

@@ -21,7 +21,7 @@
 
 Name: etercifs
 Version: 3.7.0
-Release: alt1
+Release: alt2
 
 Summary: Advanced Common Internet File System for Linux with Etersoft extension
 
@@ -33,6 +33,8 @@ Url: ftp://updates.etersoft.ru/pub/Etersoft/CIFS@Etersoft/
 
 BuildArch: noarch
 
+BuildRequires: kernel-headers-modules-std-def kernel-headers-modules-std-ll kernel-headers-modules-std-srv kernel-headers-modules-std-pae kernel-headers-modules-ovz-smp
+
 Source: %name-%version.tar.bz2
 Source1: %src_package_name-legacy-%src_legacy_version.tar.bz2
 Source23: %src_package_name-2.6.23-%src_2_6_23_version.tar.bz2
@@ -71,8 +73,7 @@ This package has Etersoft's patches for WINE@Etersoft sharing access support.
 
 %install
 mkdir -p %buildroot%_datadir/%name
-install -m644 buildmodule.sh kernel_src.list %buildroot%_datadir/%name
-install -m755 distr_vendor %buildroot%_datadir/%name
+install -m644 buildmodule.sh %buildroot%_datadir/%name
 sed -e "s|@DATADIR@|%_datadir/%name|g" < functions.sh.init > functions.sh.init.repl
 install -m644 functions.sh.init.repl %buildroot%_datadir/%name/functions.sh
 
@@ -94,10 +95,11 @@ cp %SOURCE24 %buildroot/%etercifs_src/%src_package_name-2.6.24-%src_2_6_24_versi
 cp %SOURCE25 %buildroot/%etercifs_src/%src_package_name-2.6.25-%src_2_6_25_version.tar.bz2
 cp %SOURCE26 %buildroot/%etercifs_src/%src_package_name-2.6.26-%src_2_6_26_version.tar.bz2
 cp %SOURCE27 %buildroot/%etercifs_src/%src_package_name-2.6.27-%src_2_6_27_version.tar.bz2
+cd %buildroot%_datadir/%name
+KERNEL_SRC_LIST=/usr/src/* TESTBUILD=1 ETERCIFS_SOURCES_LIST=sources/kernel-source-etercifs* sh ./buildmodule.sh
 
 %post
 %post_service %name
-%_initdir/%name build && %_initdir/%name start ||:
 
 %preun
 %preun_service %name
@@ -108,6 +110,14 @@ cp %SOURCE27 %buildroot/%etercifs_src/%src_package_name-2.6.27-%src_2_6_27_versi
 %_initdir/%name.outformat
 
 %changelog
+* Sat Nov 01 2008 Konstantin Baev <kipruss@altlinux.org> 3.7.0-alt2
+- delete last change (building module on installing rpm)
+- remove kernel_src.list and distr_vendor
+- code refactoring near finction.sh and buildmodule.sh
+- add option 'testbuild' in rc-script and now able the command:
+    service etercifs testbuild
+- run testbuild while build rpm
+
 * Thu Oct 30 2008 Konstantin Baev <kipruss@altlinux.org> 3.7.0-alt1
 - Add building module on installing rpm
 

etercifs/buildmodule.sh

@@ -20,7 +20,10 @@ else
     echo "====================================================================="
     echo "Check build etercifs module for all founded kernels"
     BUILTLIST=
-    for KERNSRC in `readlink /lib/modules/*/build` ; do
+    [ -n "$KERNEL_SRC_LIST" ] || KERNEL_SRC_LIST=`readlink /lib/modules/*/build`
+    for KERNSRC in $KERNEL_SRC_LIST ; do
+        [ -L $KERNSRC ] && [ `basename $KERNSRC` != "build" ] && continue
+        [ -f $KERNSRC/.config ] || continue
         echo "---------------------------------------------------------------------"
         detect_kernel
         if [ -z "$KERNELVERSION" ] ; then

etercifs/etercifs.init

@@ -169,6 +169,12 @@ build_module()
     fi
 }
 
+test_build_module()
+{
+    cd @DATADIR@
+    TESTBUILD=1 sh buildmodule.sh
+}
+
 case "$1" in
     start)
         start
@@ -183,6 +189,9 @@ case "$1" in
     build)
         build_module
         ;;
+    testbuild)
+        test_build_module
+        ;;
     status)
         status
         ;;

etercifs/functions.sh.init

@@ -36,12 +36,14 @@ detect_etercifs_sources()
 
 create_builddir()
 {
-    tmpdir=
-    tmpdir="$(mktemp -dt "Etercifs.XXXXXXXX")"
-
+    if [ -n "$BUILDDIR" ] ; then
+        tmpdir=$BUILDDIR
+    else
+        tmpdir=
+        tmpdir="$(mktemp -dt "Etercifs.XXXXXXXX")"
+    fi
     tar -xjf $KERNEL_SOURCE_ETERCIFS -C $tmpdir
     trap exit_handler HUP PIPE INT QUIT TERM EXIT
-
     FILENAME=`basename $KERNEL_SOURCE_ETERCIFS`
     BUILDDIR=$tmpdir/${FILENAME%.tar.bz2}
 }