Fix DKMS package upgrade and packager

Running 'yum upgrade spl-dkms' package could appear to work properly
and still leave you with no spl modules installed.  This will occur
when only the spl release, and not the version, are incremented.
This may be the case for a fast moving spl-testing repository.

During the upgrade process DKMS will realize that spl-x.y.z is already
installed and remove it.  DKMS then correctly builds the new modules
for spl-x.y.z.  However, as a final step when the old spl-x.y.z-r is
removed the %preun script runs and removes the newly build modules.
To handle this case the %preun script has been updated to only run
when the installed version exactly matches the full spec file version.

This change also updated ChangeLog section based on the DKMS
reference spec file.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Brian Behlendorf 2014-05-29 14:06:32 -07:00
parent c4f38ddd80
commit 4cdcdbff63
1 changed files with 12 additions and 5 deletions

View File

@ -1,3 +1,5 @@
%{?!packager: %define packager Brian Behlendorf <behlendorf1@llnl.gov>}
%define module @PACKAGE@ %define module @PACKAGE@
%define mkconf scripts/dkms.mkconf %define mkconf scripts/dkms.mkconf
@ -60,11 +62,16 @@ echo -e "support or upgrade DKMS to a more current version."
exit 1 exit 1
%preun %preun
# Only remove the modules if they are for this %{version}-%{release}. A
# package upgrade can replace them if only the %{release} is changed.
RELEASE="/var/lib/dkms/%{module}/%{version}/build/%{module}.release"
if [ -f $RELEASE ] && [ `cat $RELEASE`%{?dist} = "%{version}-%{release}" ]; then
echo -e
echo -e "Uninstall of %{module} module (version %{version}) beginning:"
dkms remove -m %{module} -v %{version} --all --rpm_safe_upgrade dkms remove -m %{module} -v %{version} --all --rpm_safe_upgrade
fi
exit 0 exit 0
%changelog %changelog
* Wed Aug 21 2013 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.2-1 * %(date "+%a %b %d %Y") %packager %{version}-%{release}
- Released 0.6.2-1 - Automatic build by DKMS
* Fri Mar 22 2013 Brian Behlendorf <behlendorf1@llnl.gov> - 0.6.1-1
- First official stable release.