2 a.m.
Author: hobbes1069
Update of /cvs/free/rpms/akmods/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28653
Modified Files:
akmods akmods-shutdown.service akmods.service.in akmods.spec
akmodsbuild
Added Files:
95-akmods.preset
Log Message:
* Thu Jul 23 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.4-1
- Do not mark a build as failed when only installing the RPM fails.
- Run akmods-shutdown script instead of akmods on shutdown.
- Add systemd preset file to enable services by default.
--- NEW FILE 95-akmods.preset ---
# Also see:
# https://fedoraproject.org/wiki/Starting_services_by_default
# Installing presets is not the preferred solution but until another one
# presents itself:
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=3713
enable akmods.service
enable akmods-shutdown.service
Index: akmods
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmods,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- akmods 15 Jul 2015 17:41:07 -0000 1.14
+++ akmods 25 Jul 2015 02:00:00 -0000 1.15
@@ -36,7 +36,7 @@
# global vars
myprog="akmods"
-myver="0.5.3"
+myver="0.5.4"
kmodlogfile=
continue_line=""
tmpdir=
@@ -105,6 +105,8 @@
exit ${1:-128}
}
+
+# Make sure finally() is run regardless of reason for exiting.
trap "finally" ABRT HUP INT QUIT
create_tmpdir()
@@ -272,7 +274,7 @@
return 4
fi
- # yum install - repository disabled on purpose see rfbz#3350
+ # dnf/yum install - repository disabled on purpose see rfbz#3350
akmods_echo 1 4 "Installing newly built rpms"
if [ -f /usr/bin/dnf ]
then
@@ -394,8 +396,12 @@
local someignored="true"
else
akmods_echo 1 2 -n "Building and installing ${this_kmodname}-kmod"
- if buildinstall_kmod ${this_kernelver} ${this_kmodname} ${akmods_kmodfile}
${this_kmodverrel} ; then
- akmods_echo 1 2 --success
+ buildinstall_kmod ${this_kernelver} ${this_kmodname} ${akmods_kmodfile}
${this_kmodverrel}
+ local returncode=$?
+ if [[ "$returncode" == "0" ]]; then
+ akmods_echo 1 2 --success
+ elif [[ "$returncode" == "8" ]];
then
+ akmods_echo 1 2 --failure "New kmod RPM was
built but could not be installed."
else
local somefailed="true"
fi
Index: akmods-shutdown.service
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmods-shutdown.service,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- akmods-shutdown.service 7 Apr 2015 13:32:05 -0000 1.2
+++ akmods-shutdown.service 25 Jul 2015 02:00:00 -0000 1.3
@@ -7,7 +7,7 @@
Type=oneshot
RemainAfterExit=yes
ExecStart=/bin/true
-ExecStop=-/usr/sbin/akmods --from-init
+ExecStop=-/usr/sbin/akmods-shutdown
[Install]
WantedBy=multi-user.target
Index: akmods.service.in
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmods.service.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- akmods.service.in 11 Jan 2013 15:06:41 -0000 1.2
+++ akmods.service.in 25 Jul 2015 02:00:00 -0000 1.3
@@ -5,7 +5,10 @@
[Service]
Type=oneshot
RemainAfterExit=true
-ExecStart=-/usr/sbin/akmods --from-init
+ExecStart=/usr/sbin/akmods --from-init
+# Make sure we load the nvidia module if built on startup, otherwise X will
+# fail. Harmless if not needed.
+ExecStart=-/usr/sbin/modprobe nvidia
[Install]
WantedBy=multi-user.target
Index: akmods.spec
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmods.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- akmods.spec 15 Jul 2015 19:34:32 -0000 1.22
+++ akmods.spec 25 Jul 2015 02:00:01 -0000 1.23
@@ -1,18 +1,19 @@
Name: akmods
-Version: 0.5.3
-Release: 2%{?dist}
+Version: 0.5.4
+Release: 0.3%{?dist}
Summary: Automatic kmods build and install tool
License: MIT
URL: http://rpmfusion.org/Packaging/KernelModules/Akmods
Source0: akmods
-Source2: akmodsbuild
-Source4: akmods.service.in
-Source5: akmodsposttrans
-Source6: akmods-shutdown
-Source7: akmods-shutdown.service
-Source8: akmods.h2m
+Source1: akmodsbuild
+Source2: akmodsposttrans
+Source3: akmods.service.in
+Source4: akmods-shutdown
+Source5: akmods-shutdown.service
+Source6: akmods.h2m
+Source7: 95-akmods.preset
BuildArch: noarch
@@ -62,25 +63,26 @@
%install
-mkdir -p %{buildroot}%{_usrsrc}/akmods/ \
- %{buildroot}%{_localstatedir}/cache/akmods/
+mkdir -p %{buildroot}%{_usrsrc}/akmods \
+ %{buildroot}%{_localstatedir}/cache/akmods \
+ %{buildroot}%{_prefix}/lib/systemd/system-preset
install -D -pm 0755 %{SOURCE0} %{buildroot}%{_sbindir}/akmods
-#install -D -pm 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/akmods.1
-install -D -pm 0755 %{SOURCE2} %{buildroot}%{_bindir}/akmodsbuild
-#install -D -pm 0644 %{SOURCE3} %{buildroot}%{_mandir}/man1/akmodsbuild.1
-install -D -pm 0755 %{SOURCE6} %{buildroot}%{_bindir}/akmods-shutdown
-install -D -pm 0755 %{SOURCE5}
%{buildroot}%{_sysconfdir}/kernel/postinst.d/akmodsposttrans
-install -D -pm 0644 %{SOURCE7} %{buildroot}%{_unitdir}/akmods-shutdown.service
+install -D -pm 0755 %{SOURCE1} %{buildroot}%{_sbindir}/akmodsbuild
+install -D -pm 0755 %{SOURCE4} %{buildroot}%{_sbindir}/akmods-shutdown
+install -D -pm 0755 %{SOURCE2}
%{buildroot}%{_sysconfdir}/kernel/postinst.d/akmodsposttrans
+install -D -pm 0644 %{SOURCE5} %{buildroot}%{_unitdir}/akmods-shutdown.service
-sed "s|@SERVICE(a)|display-manager.service|" %{SOURCE4} >\
+sed "s|@SERVICE(a)|display-manager.service|" %{SOURCE3} >\
%{buildroot}%{_unitdir}/akmods.service
+install -pm 0644 %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/system-preset/
+
# Generate and install man pages.
mkdir -p %{buildroot}%{_mandir}/man1
-help2man -N -i %{SOURCE8} -s 1 \
+help2man -N -i %{SOURCE6} -s 1 \
-o %{buildroot}%{_mandir}/man1/akmods.1 %{SOURCE0}
-help2man -N -i %{SOURCE8} -s 1 \
- -o %{buildroot}%{_mandir}/man1/akmodsbuild.1 %{SOURCE2}
+help2man -N -i %{SOURCE6} -s 1 \
+ -o %{buildroot}%{_mandir}/man1/akmodsbuild.1 %{SOURCE1}
%pre
@@ -104,26 +106,32 @@
%files
-%{_bindir}/akmodsbuild
-%{_bindir}/akmods-shutdown
+%{_sbindir}/akmodsbuild
+%{_sbindir}/akmods-shutdown
%{_sbindir}/akmods
%{_sysconfdir}/kernel/postinst.d/akmodsposttrans
%{_unitdir}/akmods.service
%{_unitdir}/akmods-shutdown.service
+%{_prefix}/lib/systemd/system-preset/95-akmods.preset
%{_usrsrc}/akmods
%attr(-,akmods,akmods) %{_localstatedir}/cache/akmods
%{_mandir}/man1/*
%changelog
-* Wed Jul 15 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.2-2
+* Thu Jul 23 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.4-1
+- Do not mark a build as failed when only installing the RPM fails.
+- Run akmods-shutdown script instead of akmods on shutdown.
+- Add systemd preset file to enable services by default.
+
+* Wed Jul 15 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.3-2
- Add package conflicts to stop pulling in kernel-debug-devel, fixes BZ#3386.
- Add description for the formatting of the <kernel> parameter, BZ#3580.
- Update static man pages and clean them up.
- Fixed another instance of TMPDIR causing issues.
- Added detection of dnf vs yum to akmods, fixed BZ#3481.
-* Wed Apr 4 2015 Richard Shaw <hobbes1069(a)gmail.com> - 0.5.2-1
+* Wed Apr 1 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.
Index: akmodsbuild
===================================================================
RCS file: /cvs/free/rpms/akmods/devel/akmodsbuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- akmodsbuild 15 Jul 2015 17:41:07 -0000 1.6
+++ akmodsbuild 25 Jul 2015 02:00:01 -0000 1.7
@@ -23,7 +23,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
myprog="akmodsbuild"
-myver="0.5.3"
+myver="0.5.4"
# defaults that might get overwritten by user:
kernels="$(uname -r)"