Author: kwizart
Update of /cvs/free/rpms/akmods/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13770/devel
Modified Files:
akmods akmods.spec
Log Message:
Few fixes from our bugzilla
Index: akmods
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmods,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- akmods 20 Mar 2012 18:14:12 -0000 1.11
+++ akmods 16 Nov 2014 14:29:05 -0000 1.12
@@ -87,11 +87,11 @@
fi
# global logfile
- echo "$(date +%d\ %b\ %H:%M:%S) akmods: $@" >>
"/var/cache/akmods/akmods.log"
+ echo "$(date +%Y/%m/%d\ %H:%M:%S) akmods: $@" >>
"/var/cache/akmods/akmods.log"
# the kmods logfile as well, if we work on a kmod
if [[ "${kmodlogfile}" ]]; then
- echo "$(date +%d\ %b\ %H:%M:%S) akmods: $@" >>
"${kmodlogfile}"
+ echo "$(date +%Y/%m/%d\ %H:%M:%S) akmods: $@" >>
"${kmodlogfile}"
fi
}
@@ -252,7 +252,7 @@
# copy rpmbuild log to kmod specific logfile
if [[ -s "${tmpdir}"/akmodsbuild.log ]]; then
while read line ; do
- echo "$(date +%d\ %b\ %H:%M:%S) akmodsbuild: ${line}" >>
"${kmodlogfile}"
+ echo "$(date +%Y/%m/%d\ %H:%M:%S) akmodsbuild: ${line}" >>
"${kmodlogfile}"
done < "${tmpdir}"/akmodsbuild.log
fi
@@ -268,9 +268,9 @@
return 4
fi
- # install
+ # yum install - repository disabled on purpose see rfbz#3350
akmods_echo 1 4 "Installing newly built rpms"
- rpm -U $(find "${tmpdir}results" -type f -name '*.rpm' | grep -v
debuginfo) >> "${kmodlogfile}" 2>&1
+ yum -y install --disablerepo='*' $(find "${tmpdir}results" -type f
-name '*.rpm' | grep -v debuginfo) >> "${kmodlogfile}" 2>&1
local returncode=$?
# place the newly built rpms where user expects them
Index: akmods.spec
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmods.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- akmods.spec 11 Jan 2013 15:06:41 -0000 1.18
+++ akmods.spec 16 Nov 2014 14:29:05 -0000 1.19
@@ -1,6 +1,6 @@
Name: akmods
Version: 0.5.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Automatic kmods build and install tool
Group: System Environment/Kernel
@@ -116,6 +116,11 @@
%changelog
+* Sun Nov 16 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 0.5.1-4
+- Fix akmods on armhfp - rfbz#3117
+- Use yum instead of rpm to install packages - rfbz#3350
+ Switch to a better date format
+
* Fri Jan 11 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.1-3
- Really fix akmods.service.in.