2016-04-07 13:01:12

by Jiri Kosina

[permalink] [raw]
Subject: [PATCH] kbuild/mkspec: support 'update-bootloader'-based systems

From: Jiri Kosina <[email protected]>

When uninstalling kernel RPM, we're unconditionally calling
"new-kernel-pkg --remove". This is useless on systems which are based on
'update-bootloader' script instead.

Support update-bootloader removal method as well in case the script is
present; contrary to new-kernel-pkg, this needs to be done in %postun,
otherwise update-bootloader will refuse to remove entry for kernel for
which the binary still exists.

Signed-off-by: Jiri Kosina <[email protected]>
---
scripts/package/mkspec | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index b6de63c..857c37d 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -143,6 +143,11 @@ echo "if [ -x /sbin/new-kernel-pkg ]; then"
echo "new-kernel-pkg --remove $KERNELRELEASE --rminitrd --initrdfile=/boot/initramfs-$KERNELRELEASE.img"
echo "fi"
echo ""
+echo "%postun"
+echo "if [ -x /sbin/update-bootloader ]; then"
+echo "/sbin/update-bootloader --remove $KERNELRELEASE"
+echo "fi"
+echo ""
echo "%files"
echo '%defattr (-, root, root)'
echo "/lib/modules/$KERNELRELEASE"

--
Jiri Kosina
SUSE Labs


2016-04-20 08:04:25

by Michal Marek

[permalink] [raw]
Subject: Re: [PATCH] kbuild/mkspec: support 'update-bootloader'-based systems

On Thu, Apr 07, 2016 at 03:00:54PM +0200, Jiri Kosina wrote:
> From: Jiri Kosina <[email protected]>
>
> When uninstalling kernel RPM, we're unconditionally calling
> "new-kernel-pkg --remove".

There is of course a test whether the script exists.


> This is useless on systems which are based on
> 'update-bootloader' script instead.

Right.


> Support update-bootloader removal method as well in case the script is
> present; contrary to new-kernel-pkg, this needs to be done in %postun,
> otherwise update-bootloader will refuse to remove entry for kernel for
> which the binary still exists.
>
> Signed-off-by: Jiri Kosina <[email protected]>

Applied to kbuild.git#misc. Let's see what other rpm-based distros are
going to need.

Michal