From: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Subject: [gentoo-dev] [PATCH 2/2] kernel-install.eclass: drop workaround skipping dracut kernel-install
Date: Wed, 8 Nov 2023 20:11:08 +0100 [thread overview]
Message-ID: <629ccab9-b274-47c2-9b56-199b652b6bd1@gentoo.org> (raw)
In-Reply-To: <2cbebe40-bfd1-44a4-81e0-194698481b5e@gentoo.org>
This is part of a larger PR at
https://github.com/gentoo/gentoo/pull/33727. However these two eclass
patches are relatively trivial and independent from the rest, so lets do
these first.
From 0e4e64876732eb1d2794498a4f0446ec641bf978 Mon Sep 17 00:00:00 2001
From: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Date: Wed, 8 Nov 2023 14:25:40 +0100
Subject: [PATCH] dist-kernel-utils.eclass: drop workaround skipping dracut
kernel-install
We have bumped the minimal version of dracut to 059-r4, this version
contains the fixes to the kernel-install plugin we need to prevent
the plugin from running again if the system is using uki's.
Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
---
eclass/dist-kernel-utils.eclass | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/eclass/dist-kernel-utils.eclass
b/eclass/dist-kernel-utils.eclass
index 67ae2f7b510df..d455c88ebee1c 100644
--- a/eclass/dist-kernel-utils.eclass
+++ b/eclass/dist-kernel-utils.eclass
@@ -125,20 +125,6 @@ dist-kernel_install_kernel() {
# install the combined executable in place of kernel
image=${initrd%/*}/uki.efi
mv "${initrd}" "${image}" || die
- # We moved the generated initrd, prevent dracut from running again
- # https://github.com/dracutdevs/dracut/pull/2405
- shopt -s nullglob
- local plugins=()
- for file in "${EROOT}"/etc/kernel/install.d/*.install; do
- plugins+=( "${file}" )
- done
- for file in "${EROOT}"/usr/lib/kernel/install.d/*.install; do
- if ! has "${file##*/}" 50-dracut.install 51-dracut-rescue.install
"${plugins[@]##*/}"; then
- plugins+=( "${file}" )
- fi
- done
- shopt -u nullglob
- export KERNEL_INSTALL_PLUGINS="${KERNEL_INSTALL_PLUGINS} ${plugins[@]}"
if [[ ${KERNEL_IUSE_SECUREBOOT} ]]; then
# Ensure the uki is signed if dracut hasn't already done so.
prev parent reply other threads:[~2023-11-08 19:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-08 19:09 [gentoo-dev] [PATCH 1/2] kernel-install.eclass: bump minimal dracut version Andrew Ammerlaan
2023-11-08 19:11 ` Andrew Ammerlaan [this message]
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=629ccab9-b274-47c2-9b56-199b652b6bd1@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