Author: hobbes1069 Update of /cvs/free/rpms/akmods/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20292 Modified Files: akmods akmods.spec akmodsbuild Added Files: akmods.h2m Removed Files: akmods.1 akmodsbuild.1 Log Message: * Wed Jul 15 2015 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.5.2-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. --- NEW FILE akmods.h2m --- [BUGS] https://bugzilla.rpmfusion.org/buglist.cgi?product=Fedora&component=a... [REPORTING BUGS] Submit a bug against the akmods component at: .br https://bugzilla.rpmfusion.org/enter_bug.cgi?product=Fedora [AUTHOR] Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> [MAINTAINER] Richard Shaw <hobbes1069 [AT] gmail [DOT] com> [SEE ALSO] http://rpmfusion.org/Packaging/KernelModules/Akmods Index: akmods =================================================================== RCS file: /cvs/free/rpms/akmods/devel/akmods,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- akmods 7 Apr 2015 13:32:05 -0000 1.13 +++ akmods 15 Jul 2015 17:41:07 -0000 1.14 @@ -36,7 +36,7 @@ # global vars myprog="akmods" -myver="0.4.0" +myver="0.5.3" kmodlogfile= continue_line="" tmpdir= @@ -244,6 +244,10 @@ # akmods_echo will log to this file from now on as well kmodlogfile="/var/cache/akmods/${this_kmodname}/.last.log" + # Unset TMPDIR since it is misused by "runuser" + # https://bugzilla.rpmfusion.org/show_bug.cgi?id=2596 + unset TMPDIR + # build module using akmod akmods_echo 1 4 "Building RPM using the command '$(which akmodsbuild) --target $(uname -m) --kernels ${this_kernelver} ${this_kmodsrpm}'" /sbin/runuser -s /bin/bash -c "$(which akmodsbuild) --quiet --quiet --target $(uname -m) --kernels ${this_kernelver} --outputdir ${tmpdir}results --logfile ${tmpdir}/akmodsbuild.log ${this_kmodsrpm}" akmods >> "${kmodlogfile}" 2>&1 @@ -270,7 +274,14 @@ # yum install - repository disabled on purpose see rfbz#3350 akmods_echo 1 4 "Installing newly built rpms" - yum -y install --disablerepo='*' $(find "${tmpdir}results" -type f -name '*.rpm' | grep -v debuginfo) >> "${kmodlogfile}" 2>&1 + if [ -f /usr/bin/dnf ] + then + akmods_echo 1 4 "DNF detected" + dnf -y install --disablerepo='*' $(find "${tmpdir}results" -type f -name '*.rpm' | grep -v debuginfo) >> "${kmodlogfile}" 2>&1 + else + akmods_echo 1 4 "DNF not found, using YUM instead." + yum -y install --disablerepo='*' $(find "${tmpdir}results" -type f -name '*.rpm' | grep -v debuginfo) >> "${kmodlogfile}" 2>&1 + fi local returncode=$? # place the newly built rpms where user expects them @@ -407,11 +418,12 @@ myprog_help () { - echo "Usage: ${myprog} [OPTIONS]" - echo $'\n'"Checks the akmod packages and rebuilds them if needed" - echo $'\n'"Available options:" + echo "Checks the akmod packages and rebuilds them if needed" + echo $'\n'"Usage: ${myprog} [OPTIONS]" + echo $'\n'"Options:" echo " --force -- try all, even if they failed earlier" echo " --kernels <kernel> -- build and install only for kernel <kernel>" + echo " (formatted the same as 'uname -r' would produce)" echo " --akmod <akmod> -- build and install only akmod <akmod>" } Index: akmods.spec =================================================================== RCS file: /cvs/free/rpms/akmods/devel/akmods.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- akmods.spec 7 Apr 2015 13:32:05 -0000 1.20 +++ akmods.spec 15 Jul 2015 17:41:07 -0000 1.21 @@ -1,19 +1,18 @@ Name: akmods -Version: 0.5.2 -Release: 1%{?dist} +Version: 0.5.3 +Release: 2%{?dist} Summary: Automatic kmods build and install tool License: MIT URL: http://rpmfusion.org/Packaging/KernelModules/Akmods Source0: akmods -Source1: akmods.1 Source2: akmodsbuild -Source3: akmodsbuild.1 Source4: akmods.service.in Source5: akmodsposttrans Source6: akmods-shutdown Source7: akmods-shutdown.service +Source8: akmods.h2m BuildArch: noarch @@ -33,6 +32,8 @@ # We use a virtual provide that would match either # kernel-devel or kernel-PAE-devel Requires: kernel-devel-uname-r +# Try to stop kernel-debug-devel from being chosen over kernel-devel. +Conflicts: kernel-debug-devel # we create a special user that used by akmods to build kmod packages Requires(pre): shadow-utils @@ -62,20 +63,22 @@ mkdir -p %{buildroot}%{_usrsrc}/akmods/ \ %{buildroot}%{_localstatedir}/cache/akmods/ install -D -pm 0755 %{SOURCE0} %{buildroot}%{_sbindir}/akmods -install -D -pm 0644 %{SOURCE1} %{buildroot}%{_mandir}/man1/akmods.1 +#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 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 -%if 0%{?fedora} >= 18 sed &quot;s|@SERVICE(a)|display-manager.service|&quot; %{SOURCE4} >\ %{buildroot}%{_unitdir}/akmods.service -%else -sed &quot;s|@SERVICE(a)|prefdm.service|&quot; %{SOURCE4} >\ - %{buildroot}%{_unitdir}/akmods.service -%endif + +# Generate and install man pages. +mkdir -p %{buildroot}%{_mandir}/man1 +help2man -N -i %{SOURCE8} -s 1 \ + -o %{buildroot}%{_mandir}/man1/akmods.1 %{SOURCE0} +help2man -N -i %{SOURCE8} -s 1 \ + -o %{buildroot}%{_mandir}/man1/akmodsbuild.1 %{SOURCE2} %pre @@ -86,19 +89,16 @@ -c "User is used by akmods to build akmod packages" akmods %post -# Systemd -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl enable akmods.service >/dev/null 2>&1 || : - /bin/systemctl enable akmods-shutdown.service >/dev/null 2>&1 || : -fi +%systemd_post akmods.service +%systemd_post akmods-shutdown.service %preun %systemd_preun akmods.service %systemd_preun akmods-shutdown.service %postun -%systemd_postun +%systemd_postun akmods.service +%systemd_postun akmods-shutdown.service %files @@ -114,6 +114,13 @@ %changelog +* Wed Jul 15 2015 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.5.2-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&gt; - 0.5.2-1 - Fix temporary directory creation when TMPDIR environment variable is set, fixes BZ#2596. Index: akmodsbuild =================================================================== RCS file: /cvs/free/rpms/akmods/devel/akmodsbuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- akmodsbuild 7 Apr 2015 13:32:05 -0000 1.5 +++ akmodsbuild 15 Jul 2015 17:41:07 -0000 1.6 @@ -23,7 +23,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # myprog="akmodsbuild" -myver="0.4.0" +myver="0.5.3" # defaults that might get overwritten by user: kernels="$(uname -r)" @@ -259,18 +259,17 @@ myprog_help () { - echo "Usage: ${myprog} [OPTIONS] <SRPMS>" - echo $'\n'"Rebuilds kmod SRPM(s)" - echo $'\n'"Available options (and their defaults): " + echo "Rebuilds kmod SRPM(s)" + echo $'\n'"Usage: ${myprog} [OPTIONS] <SRPMS>" + echo $'\n'"Options:" echo " -k, --kernels -- build for kernel-versions (output from 'uname -r')" echo " -l, --logfile <file> -- save rpmduild output to <file>" echo " -o, --outputdir <dir> -- save rpms and logs here (current directory)" echo " -t, --target -- target-arch (output from 'uname -m')" echo " -v, --verbose -- increase verboseness" echo " -q, --quiet -- be more quiet" - echo echo " -h, --help -- show usage" - echo " -V, --version -- show version" + echo " -V, --version -- show version" } while [ "${1}" ] ; do --- akmods.1 DELETED --- --- akmodsbuild.1 DELETED ---