Commit b1e3141a authored by Vitaly Lipatov's avatar Vitaly Lipatov

some fixes

parent cc8bd06c
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
compile_module compile_module
check_build_module check_build_module
fi fi
fi
done done
echo "=====================================================================" echo "====================================================================="
echo "CIFS Linux kernel module $MODULENAME $MODULEVERSION built for follow kernels (marked as ---DONE or ---FAILURE):" echo "CIFS Linux kernel module $MODULENAME $MODULEVERSION built for follow kernels (marked as ---DONE or ---FAILURE):"
......
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
# 2006, 2007, 2008, 2009, 2010, 2013 Public domain # 2006, 2007, 2008, 2009, 2010, 2013 Public domain
cd @DATADIR@ cd @DATADIR@
sh buildmodule.sh . ./buildmodule.sh
...@@ -15,7 +15,7 @@ fatal() ...@@ -15,7 +15,7 @@ fatal()
exit 1 exit 1
} }
PACKAGEINFO=@DATADIR@/package.conf [ -s "$PACKAGEINFO" ] || PACKAGEINFO=@DATADIR@/package.conf
if [ -f "$PACKAGEINFO" ] ; then if [ -f "$PACKAGEINFO" ] ; then
. $PACKAGEINFO . $PACKAGEINFO
else else
...@@ -215,12 +215,15 @@ detect_etercifs_sources() ...@@ -215,12 +215,15 @@ detect_etercifs_sources()
# try get like version # try get like version
if [ -z "$KERNEL_SOURCE_ETERCIFS" ] ; then if [ -z "$KERNEL_SOURCE_ETERCIFS" ] ; then
KERNEL_SOURCE_ETERCIFS=$(list_source_versions | sort -r -V | head -n 1) KERNEL_SOURCE_ETERCIFS=$(list_source_versions | sort -r -V | head -n 1)
LATEST_SOURCES=$(echo $KERNEL_SOURCE_ETERCIFS | cut -d"-" -f 4) if [ -n "$KERNEL_SOURCE_ETERCIFS" ] ; then
echo "Warning! Couldn't find module sources for the current kernel $KERNEL!" LATEST_SOURCES=$(echo $KERNEL_SOURCE_ETERCIFS | cut -d"-" -f 4)
echo "Using the latest supported sources - from v$LATEST_SOURCES kernel!" echo "Warning! Couldn't find module sources for the kernel $KERNEL!"
echo "Using the latest supported sources - from v$LATEST_SOURCES kernel!"
else
echo "Can't locate any appropiate kernel sources for the kernel $KERNEL"
fi
fi fi
[ -n "$KERNEL_SOURCE_ETERCIFS" ] || fatal "Can't locate etercifs kernel module sources for current kernel!"
} }
exit_handler() exit_handler()
...@@ -352,7 +355,7 @@ dkms_build_module() ...@@ -352,7 +355,7 @@ dkms_build_module()
STATUS=`dkms status -m $MODULENAME -v $MODULEVERSION` STATUS=`dkms status -m $MODULENAME -v $MODULEVERSION`
[ "$STATUS" ] || a= dkms add -m $MODULENAME -v $MODULEVERSION [ "$STATUS" ] || a= dkms add -m $MODULENAME -v $MODULEVERSION
BUILDDIR=$SRC_DIR BUILDDIR=$SRC_DIR
create_builddir create_builddir || fatal
change_cifsversion change_cifsversion
a= dkms uninstall -m $MODULENAME -v $MODULEVERSION --rpm_safe_upgrade a= dkms uninstall -m $MODULENAME -v $MODULEVERSION --rpm_safe_upgrade
a= dkms build -m $MODULENAME -v $MODULEVERSION --rpm_safe_upgrade a= dkms build -m $MODULENAME -v $MODULEVERSION --rpm_safe_upgrade
...@@ -377,8 +380,8 @@ change_cifsversion() ...@@ -377,8 +380,8 @@ change_cifsversion()
compile_module() compile_module()
{ {
detect_etercifs_sources detect_etercifs_sources
create_builddir check_headers || return
check_headers create_builddir || return
set_gcc set_gcc
# SMP build # SMP build
......
DATADIR=./
SRC_DIR=/usr/src/etercifs-5.5.0
MODULENAME=etercifs
MODULEFILENAME=etercifs.ko
MODULEVERSION=5.5.0
PACKAGEVEREL=5.5.0-alt1
CHECK_VERSION=1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment