linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] kbuild: rpm-pkg: use kernel-install as a fallback for new-kernel-pkg
@ 2018-04-11 18:15 Javier Martinez Canillas
  2018-04-13 14:22 ` Masahiro Yamada
  0 siblings, 1 reply; 2+ messages in thread
From: Javier Martinez Canillas @ 2018-04-11 18:15 UTC (permalink / raw)
  To: linux-kernel
  Cc: Peter Jones, Paolo Abeni, Josh Boyer, Javier Martinez Canillas,
	Michal Marek, Masahiro Yamada, linux-kbuild

The new-kernel-pkg script is only present when grubby is installed, but it
may not always be the case. So if the script isn't present, attempt to use
the kernel-install script as a fallback instead.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>

---

 scripts/package/mkspec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 61427c6f2209..e05646dc24dc 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -118,6 +118,8 @@ $S$M	ln -sf /usr/src/kernels/$KERNELRELEASE source
 	%preun
 	if [ -x /sbin/new-kernel-pkg ]; then
 	new-kernel-pkg --remove $KERNELRELEASE --rminitrd --initrdfile=/boot/initramfs-$KERNELRELEASE.img
+	elif [ -x /usr/bin/kernel-install ]; then
+	kernel-install remove $KERNELRELEASE
 	fi
 
 	%postun
-- 
2.14.3

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] kbuild: rpm-pkg: use kernel-install as a fallback for new-kernel-pkg
  2018-04-11 18:15 [PATCH] kbuild: rpm-pkg: use kernel-install as a fallback for new-kernel-pkg Javier Martinez Canillas
@ 2018-04-13 14:22 ` Masahiro Yamada
  0 siblings, 0 replies; 2+ messages in thread
From: Masahiro Yamada @ 2018-04-13 14:22 UTC (permalink / raw)
  To: Javier Martinez Canillas
  Cc: Linux Kernel Mailing List, Peter Jones, Paolo Abeni, Josh Boyer,
	Michal Marek, Linux Kbuild mailing list

2018-04-12 3:15 GMT+09:00 Javier Martinez Canillas <javierm@redhat.com>:
> The new-kernel-pkg script is only present when grubby is installed, but it
> may not always be the case. So if the script isn't present, attempt to use
> the kernel-install script as a fallback instead.
>
> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
>
> ---
>

Applied to linux-kbuild.  Thanks!


>  scripts/package/mkspec | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/scripts/package/mkspec b/scripts/package/mkspec
> index 61427c6f2209..e05646dc24dc 100755
> --- a/scripts/package/mkspec
> +++ b/scripts/package/mkspec
> @@ -118,6 +118,8 @@ $S$M        ln -sf /usr/src/kernels/$KERNELRELEASE source
>         %preun
>         if [ -x /sbin/new-kernel-pkg ]; then
>         new-kernel-pkg --remove $KERNELRELEASE --rminitrd --initrdfile=/boot/initramfs-$KERNELRELEASE.img
> +       elif [ -x /usr/bin/kernel-install ]; then
> +       kernel-install remove $KERNELRELEASE
>         fi
>
>         %postun
> --
> 2.14.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



-- 
Best Regards
Masahiro Yamada

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-04-13 14:23 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-11 18:15 [PATCH] kbuild: rpm-pkg: use kernel-install as a fallback for new-kernel-pkg Javier Martinez Canillas
2018-04-13 14:22 ` Masahiro Yamada

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).