public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
From: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Subject: [gentoo-dev] [PATCH] kernel-install.eclass: also cleanup uki.efi in postrm
Date: Wed, 15 Nov 2023 20:12:59 +0100	[thread overview]
Message-ID: <f6701fd0-4a48-4359-9975-0f61c64af2e4@gentoo.org> (raw)

This fixes a small issue in the postrm phase, the name of the unified 
kernel image is always uki.efi, not initrd.uefi.

Best regards,
Andrew


 From 4ca978b9d1013cb7b28493af45cd4fbd57e1f76e Mon Sep 17 00:00:00 2001
From: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Date: Wed, 15 Nov 2023 20:00:15 +0100
Subject: [PATCH] kernel-install.eclass: also cleanup uki.efi in postrm

Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
---
  eclass/kernel-install.eclass | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass
index ea6ba3569a170..a0eceae8280bb 100644
--- a/eclass/kernel-install.eclass
+++ b/eclass/kernel-install.eclass
@@ -510,7 +510,7 @@ kernel-install_pkg_postrm() {
  		local kernel_dir=${EROOT}/usr/src/linux-${dir_ver}
  		local image_path=$(dist-kernel_get_image_path)
  		ebegin "Removing initramfs"
-		rm -f "${kernel_dir}/${image_path%/*}"/initrd{,.uefi} &&
+		rm -f "${kernel_dir}/${image_path%/*}"/{initrd,uki.efi} &&
  			find "${kernel_dir}" -depth -type d -empty -delete
  		eend ${?}
  	fi


                 reply	other threads:[~2023-11-15 19:13 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f6701fd0-4a48-4359-9975-0f61c64af2e4@gentoo.org \
    --to=andrewammerlaan@gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox