3.8.0-alt2

etercifs.spec

@@ -21,7 +21,7 @@
 
 Name: etercifs
 Version: 3.8.0
-Release: alt1
+Release: alt2
 
 Summary: Advanced Common Internet File System for Linux with Etersoft extension
 
@@ -111,6 +111,9 @@ cp %SOURCE27 %buildroot/%etercifs_src/%src_package_name-2.6.27-%src_2_6_27_versi
 %_initdir/%name.outformat
 
 %changelog
+* Fri Nov 07 2008 Konstantin Baev <kipruss@altlinux.org> 3.8.0-alt2
+- fix building module on Ubuntu
+
 * Thu Nov 06 2008 Konstantin Baev <kipruss@altlinux.org> 3.8.0-alt1
 - fix building module with dkms
 - add config file /etc/etercifs.conf

etercifs/functions.sh

@@ -125,11 +125,9 @@ set_gcc()
         export GCCNAME=gcc
     fi
 
-    [ $TESTBUILD -eq 1 ] || echo `which $GCCNAME`
-    if ! which $GCCNAME &>/dev/null ; then
-        echo "GCC compiler have not found. Please install gcc package."
-        exit 1
-    fi
+    PATHGCC=`which $GCCNAME`
+    [ $PATHGCC ] || fatal "GCC compiler have not found. Please install gcc package."
+    echo $PATHGCC
 }
 
 dkms_build_module()
@@ -156,15 +154,8 @@ compile_module()
     [ -z "$RPM_BUILD_NCPUS" ] && RPM_BUILD_NCPUS=`/usr/bin/getconf _NPROCESSORS_ONLN`
     [ "$RPM_BUILD_NCPUS" -gt 1 ] && MAKESMP="-j$RPM_BUILD_NCPUS" || MAKESMP=""
 
-    # Clean, build and check
-    #rm -f $BUILDDIR/$MODULEFILENAME
-    if [ $TESTBUILD -eq 1 ] ; then
-        make $USEGCC -C $KERNSRC here=$BUILDDIR SUBDIRS=$BUILDDIR clean &>/dev/null
-        make $USEGCC -C $KERNSRC here=$BUILDDIR SUBDIRS=$BUILDDIR modules $MAKESMP &>/dev/null
-    else
-        make $USEGCC -C $KERNSRC here=$BUILDDIR SUBDIRS=$BUILDDIR clean
-        make $USEGCC -C $KERNSRC here=$BUILDDIR SUBDIRS=$BUILDDIR modules $MAKESMP
-    fi
+    make $USEGCC -C $KERNSRC here=$BUILDDIR SUBDIRS=$BUILDDIR clean
+    make $USEGCC -C $KERNSRC here=$BUILDDIR SUBDIRS=$BUILDDIR modules $MAKESMP
 }
 
 install_module()