rpms/akmods/F-16 akmods,1.5,1.6 akmods.spec,1.7,1.8
Author: hobbes1069
Update of /cvs/free/rpms/akmods/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30204
Modified Files:
akmods akmods.spec
Log Message:
* Tue Nov 15 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.3.7-2
- Fix rpmdev-vercmp handling.
Index: akmods
===================================================================
RCS file: /cvs/free/rpms/akmods/F-16/akmods,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- akmods 29 Sep 2011 23:17:43 -0000 1.5
+++ akmods 19 Nov 2011 23:49:35 -0000 1.6
@@ -321,14 +321,15 @@
local akmodver=$(rpm -qp --qf '%{EPOCH}:%{VERSION}-%{RELEASE}\n'
/usr/src/akmods/"${this_kmodname}"-kmod.latest | sed 's|(none)|0|;
s!\.\(fc\|lvn\)[0-9]*!!g')
rpmdev-vercmp "${kmodver}" "${akmodver}" &>/dev/null
- if [ "$?" == 0 ]; then
+ local retvalue=$?
+ if [ "$retvalue" == 0 ]; then
# Versions are the same. Nothing to do.
return 0
- elif [ "$?" == 11 ]; then
+ elif [ "$retvalue" == 11 ]; then
# kmod is newer, this nomally shouldn't happen.
akmods_echo 1 2 -n "Warning: installed kmod is newer then the akmod"
return 0
- elif [ "$?" == 12 ]; then
+ elif [ "$retvalue" == 12 ]; then
# akmod is newer, need to build kmod.
return 1
else
@@ -370,6 +371,7 @@
akmods_echo 1 2 "directories are missing:"
akmods_echo 1 2 "/usr/src/kernels/${this_kernelver}/"
akmods_echo 1 2 -n "/lib/modules/${this_kernelver}/build/"
+ akmods_echo 1 2 "Is the correct kernel-devel package installed?"
akmods_echo 1 2 --failure
return 1
fi
Index: akmods.spec
===================================================================
RCS file: /cvs/free/rpms/akmods/F-16/akmods.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- akmods.spec 29 Sep 2011 23:17:43 -0000 1.7
+++ akmods.spec 19 Nov 2011 23:49:35 -0000 1.8
@@ -1,6 +1,6 @@
Name: akmods
Version: 0.3.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Automatic kmods build and install tool
Group: System Environment/Kernel
@@ -101,6 +101,9 @@
%changelog
+* Tue Nov 15 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.3.7-2
+- Fix rpmdev-vercmp handling.
+
* Fri Sep 23 2011 Richard Shaw <hobbes1069(a)gmail.com> - 0.3.7-1
- Update to 0.3.7
- Fixes #1805. Version check is now properly based on rpmdev-vercmp exit code.