10 a.m.
Author: sergiomb
Update of /cvs/free/rpms/akmods/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9727
Modified Files:
akmods akmods-shutdown.service akmods.spec akmodsbuild
Log Message:
* Wed Apr 4 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.2-1
- Fix temporary directory creation when TMPDIR environment variable is set,
fixes BZ#2596.
- Update systemd scripts to use macros.
- Fix akmods run on shutdown systemd unit file, fixes BZ#3503.
Index: akmods
===================================================================
RCS file: /cvs/free/rpms/akmods/F-20/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 8 Apr 2015 10:00:41 -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
}
@@ -109,7 +109,7 @@
create_tmpdir()
{
- if ! tmpdir="$(mktemp -d -t ${myprog}.XXXXXXXX)/" ; then
+ if ! tmpdir="$(mktemp -d -p /tmp ${myprog}.XXXXXXXX)/" ; then
akmods_echo 2 1 "ERROR: failed to create tmpdir."
akmods_echo 2 1 --failure; return 1
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-shutdown.service
===================================================================
RCS file: /cvs/free/rpms/akmods/F-20/akmods-shutdown.service,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- akmods-shutdown.service 22 Dec 2012 16:02:20 -0000 1.1
+++ akmods-shutdown.service 8 Apr 2015 10:00:41 -0000 1.2
@@ -6,7 +6,8 @@
[Service]
Type=oneshot
RemainAfterExit=yes
-ExecStart=-/usr/sbin/akmods --from-init
+ExecStart=/bin/true
+ExecStop=-/usr/sbin/akmods --from-init
[Install]
WantedBy=multi-user.target
Index: akmods.spec
===================================================================
RCS file: /cvs/free/rpms/akmods/F-20/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 8 Apr 2015 10:00:41 -0000 1.19
@@ -1,11 +1,11 @@
Name: akmods
-Version: 0.5.1
-Release: 3%{?dist}
+Version: 0.5.2
+Release: 1%{?dist}
Summary: Automatic kmods build and install tool
-Group: System Environment/Kernel
License: MIT
URL: http://rpmfusion.org/Packaging/KernelModules/Akmods
+
Source0: akmods
Source1: akmods.1
Source2: akmodsbuild
@@ -38,10 +38,10 @@
Requires(pre): shadow-utils
# systemd unit requirements.
-BuildRequires: systemd-units
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+BuildRequires: systemd
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
%description
@@ -94,13 +94,11 @@
fi
%preun
-if [ $1 -eq 0 ] ; then
- # Package removal, not upgrade
- /bin/systemctl --no-reload disable akmods.service > /dev/null 2>&1 || :
- /bin/systemctl stop akmods.service > /dev/null 2>&1 || :
- /bin/systemctl --no-reload disable akmods-shutdown.service > /dev/null 2>&1
|| :
- /bin/systemctl stop akmods-shutdown.service > /dev/null 2>&1 || :
-fi
+%systemd_preun akmods.service
+%systemd_preun akmods-shutdown.service
+
+%postun
+%systemd_postun
%files
@@ -116,6 +114,17 @@
%changelog
+* Wed Apr 4 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.2-1
+- Fix temporary directory creation when TMPDIR environment variable is set,
+ fixes BZ#2596.
+- Update systemd scripts to use macros.
+- Fix akmods run on shutdown systemd unit file, fixes BZ#3503.
+
+* 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.
Index: akmodsbuild
===================================================================
RCS file: /cvs/free/rpms/akmods/F-20/akmodsbuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- akmodsbuild 5 Mar 2012 14:57:17 -0000 1.3
+++ akmodsbuild 8 Apr 2015 10:00:41 -0000 1.4
@@ -28,6 +28,9 @@
# defaults that might get overwritten by user:
kernels="$(uname -r)"
target="$(uname -m)"
+if [[ "${target}" == "armv7l" ]]; then
+ target="armv7hl"
+fi
numberofjobs=$(grep -c processor /proc/cpuinfo 2> /dev/null)
verboselevel=2
outputdir="${PWD}"
@@ -85,7 +88,7 @@
## preparations
# tmpdir
- if ! tmpdir="$(mktemp -d -t ${myprog}.XXXXXXXX)" ; then
+ if ! tmpdir="$(mktemp -d -p /tmp ${myprog}.XXXXXXXX)" ; then
echo "ERROR: Could create tempdir."
exit 1
fi