From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] dracut: add EFI kernel hook
Date: Mon, 01 Jun 2020 05:57:52 +0200 [thread overview]
Message-ID: <20200601035752.oHft1dIU4AsX-FfPeRZsr4pLSEh5NRJHkJj9ghOxQmE@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22484@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 370 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages dracut
https://github.com/void-linux/void-packages/pull/22484
dracut: add EFI kernel hook
Also made some small formatting changes.
@ahesford
A patch file from https://github.com/void-linux/void-packages/pull/22484.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-dracut-22484.patch --]
[-- Type: text/x-diff, Size: 5322 bytes --]
From 298ab485a32995d0852adbcd0d7370ec4135d080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 31 May 2020 21:39:55 -0300
Subject: [PATCH] dracut: add EFI kernel hook
Also made some small formatting changes.
---
srcpkgs/dracut/files/dracut-uefi-hook.confd | 19 +++++++++++++
.../dracut/files/kernel-uefi-hook-postinst | 28 +++++++++++++++++++
srcpkgs/dracut/files/kernel-uefi-hook-postrm | 20 +++++++++++++
srcpkgs/dracut/template | 22 ++++++++++++---
4 files changed, 85 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/dracut/files/dracut-uefi-hook.confd
create mode 100644 srcpkgs/dracut/files/kernel-uefi-hook-postinst
create mode 100644 srcpkgs/dracut/files/kernel-uefi-hook-postrm
diff --git a/srcpkgs/dracut/files/dracut-uefi-hook.confd b/srcpkgs/dracut/files/dracut-uefi-hook.confd
new file mode 100644
index 00000000000..9bee61c1530
--- /dev/null
+++ b/srcpkgs/dracut/files/dracut-uefi-hook.confd
@@ -0,0 +1,19 @@
+# Options for the dracut-uefi kernel hook script installed by the dracut package.
+
+CREATE_UEFI_BUNDLES=0
+# To allow dracut to create EFI bundles, set
+#CREATE_UEFI_BUNDLES=1
+# This requires an EFI stub, usually provided by the gummiboot package,
+# as well as setting the kernel command line.
+
+# You can set the kernel command line with
+#KERNEL_CMDLINE="root=..."
+# or by setting kernel_cmdline in a dracut.conf(5) file.
+# If you configure it there, set
+#SKIP_KERNEL_CMDLINE=1
+
+# You can set command line options for the dracut command
+#OPTIONS=
+
+# Output directory for the EFI bundle
+#UEFI_BUNDLE_DIR="/boot/efi/EFI/Void/"
diff --git a/srcpkgs/dracut/files/kernel-uefi-hook-postinst b/srcpkgs/dracut/files/kernel-uefi-hook-postinst
new file mode 100644
index 00000000000..606698dde53
--- /dev/null
+++ b/srcpkgs/dracut/files/kernel-uefi-hook-postinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+#
+# Kernel post-install hook for dracut EFI bundle.
+#
+# Arguments passed to this script: $1 pkgname, $2 version.
+#
+PKGNAME="$1"
+VERSION="$2"
+
+. "${ROOTDIR}/etc/default/dracut-uefi-hook"
+if [ "x${CREATE_UEFI_BUNDLES}" != x1 ]; then
+ exit 0
+fi
+
+if [ ! -x bin/dracut ]; then
+ exit 0
+ fi
+
+if [ -z "${KERNEL_CMDLINE}" ] && [ "x${SKIP_KERNEL_CMDLINE}" != x1 ]; then
+ echo "ERROR: You need to set the kernel command line in /etc/default/dracut-uefi-hook"
+ exit 1
+fi
+
+UEFI_BUNDLE_DIR="${UEFI_BUNDLE_DIR:-boot/efi/EFI/Void}"
+OPTIONS="${OPTIONS} --force --uefi ${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi ${VERSION}"
+
+dracut --kernel-cmdline="${KERNEL_CMDLINE}" ${OPTIONS}
+exit $?
diff --git a/srcpkgs/dracut/files/kernel-uefi-hook-postrm b/srcpkgs/dracut/files/kernel-uefi-hook-postrm
new file mode 100644
index 00000000000..96262222e7d
--- /dev/null
+++ b/srcpkgs/dracut/files/kernel-uefi-hook-postrm
@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+# Kernel post-remove hook for dracut EFI bundle.
+#
+# Arguments passed to this script: $1 pkgname, $2 version.
+#
+PKGNAME="$1"
+VERSION="$2"
+
+. "${ROOTDIR}/etc/default/dracut-uefi-hook"
+if [ "x${CREATE_UEFI_BUNDLES}" != x1 ]; then
+ exit 0
+fi
+
+UEFI_BUNDLE_DIR="${UEFI_BUNDLE_DIR:-boot/efi/EFI/Void}"
+
+if [ -f "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi" ]; then
+ rm -fv "${UEFI_BUNDLE_DIR}/linux-${VERSION}.efi"
+fi
+exit $?
diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template
index 3c6aca0ada6..78b2e0c7807 100644
--- a/srcpkgs/dracut/template
+++ b/srcpkgs/dracut/template
@@ -1,7 +1,7 @@
# Template file for 'dracut'
pkgname=dracut
version=050
-revision=2
+revision=3
build_style=configure
configure_args="--prefix=/usr --sysconfdir=/etc"
conf_files="/etc/dracut.conf"
@@ -16,8 +16,8 @@ distfiles="https://github.com/dracutdevs/dracut/archive/${version}.tar.gz"
checksum=f9dbf18597e5929221365964293212c8c9ffb7d84529c5a338c834ecab06e333
make_dirs="
- /etc/dracut.conf.d 0755 root root
- /usr/lib/dracut/dracut.conf.d 0755 root root"
+ /etc/dracut.conf.d 0755 root root
+ /usr/lib/dracut/dracut.conf.d 0755 root root"
case "$XBPS_TARGET_MACHINE" in
*-musl) # Add musl-fts implementation
@@ -25,6 +25,13 @@ case "$XBPS_TARGET_MACHINE" in
;;
esac
+case "$XBPS_TARGET_MACHINE" in
+ i686*|x86_64*|aarch64*) # EFI bundle config and hooks
+ _efi_bundle=1
+ conf_files+=" /etc/default/dracut-uefi-hook"
+ ;;
+esac
+
do_build() {
case "$XBPS_TARGET_MACHINE" in
*-musl) make ${makejobs} LDLIBS="-lfts" ;;
@@ -40,6 +47,13 @@ post_install() {
# kernel hooks.
vinstall ${FILESDIR}/kernel-hook-postinst 755 etc/kernel.d/post-install 20-dracut
vinstall ${FILESDIR}/kernel-hook-postrm 755 etc/kernel.d/post-remove 20-dracut
+
+ if [ "${_efi_bundle}" ]; then
+ vinstall ${FILESDIR}/dracut-uefi-hook.confd 644 etc/default dracut-uefi-hook
+ vinstall ${FILESDIR}/kernel-uefi-hook-postinst 755 etc/kernel.d/post-install 20-dracut-uefi
+ vinstall ${FILESDIR}/kernel-uefi-hook-postrm 755 etc/kernel.d/post-remove 20-dracut-uefi
+ fi
+
# We don't need the systemd stuff.
rm -rf ${DESTDIR}/usr/lib/dracut/modules.d/*systemd*
rm -f ${DESTDIR}/usr/share/man/man8/*.service.*
@@ -52,7 +66,7 @@ dracut-network_package() {
archs=noarch
pkg_install() {
for f in 40network 90livenet 95fcoe 95iscsi \
- 95nbd 95nfs 95zfcp 95znet; do
+ 95nbd 95nfs 95zfcp 95znet; do
vmove usr/lib/dracut/modules.d/${f}
done
}
next prev parent reply other threads:[~2020-06-01 3:57 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-01 0:41 [PR PATCH] " ericonr
2020-06-01 0:47 ` [PR PATCH] [Updated] " ericonr
2020-06-01 1:06 ` ericonr
2020-06-01 2:59 ` ericonr
2020-06-01 3:57 ` ericonr [this message]
2020-06-01 7:32 ` ericonr
2020-07-20 3:58 ` ericonr
2020-07-20 14:41 ` [PR PATCH] [Updated] " ericonr
2020-07-20 16:07 ` [PR REVIEW] " Duncaen
2020-07-20 16:07 ` Duncaen
2020-07-20 16:07 ` Duncaen
2020-07-20 16:16 ` sgn
2020-07-20 16:16 ` sgn
2020-07-20 16:16 ` sgn
2020-07-20 16:16 ` sgn
2020-07-20 16:16 ` sgn
2020-07-20 16:16 ` sgn
2020-07-20 16:20 ` sgn
2020-07-20 16:28 ` sgn
2020-07-20 18:17 ` ericonr
2020-07-20 18:18 ` ericonr
2020-07-20 18:23 ` ericonr
2020-07-20 18:26 ` ericonr
2020-07-20 18:26 ` ericonr
2020-07-20 18:28 ` [PR PATCH] [Updated] " ericonr
2020-07-20 23:05 ` [PR REVIEW] " ericonr
2020-07-20 23:06 ` ericonr
2020-07-20 23:32 ` ahesford
2020-07-20 23:39 ` ericonr
2020-07-20 23:43 ` ericonr
2020-07-21 0:12 ` sgn
2020-07-21 0:12 ` sgn
2020-07-21 0:16 ` sgn
2020-07-21 0:17 ` ahesford
2020-07-21 0:27 ` ericonr
2020-07-21 1:05 ` sgn
2020-07-21 1:12 ` ericonr
2020-07-21 1:21 ` ericonr
2020-07-21 1:23 ` [PR PATCH] [Updated] " ericonr
2020-07-21 1:24 ` ericonr
2020-07-27 11:56 ` sgn
2020-07-27 12:39 ` ericonr
2020-07-27 12:49 ` [PR REVIEW] " sgn
2020-07-27 12:49 ` sgn
2020-07-27 12:51 ` [PR PATCH] [Updated] " ericonr
2020-07-27 12:52 ` [PR REVIEW] " ericonr
2020-07-27 12:52 ` [PR PATCH] [Updated] " ericonr
2020-07-27 12:53 ` sgn
2020-07-27 12:54 ` sgn
2020-07-27 12:56 ` sgn
2020-07-27 12:58 ` ericonr
2020-07-27 13:04 ` sgn
2020-07-27 13:09 ` ericonr
2020-07-27 13:18 ` [PR PATCH] [Updated] " ericonr
2020-07-27 13:19 ` ericonr
2020-07-27 13:20 ` [PR PATCH] [Updated] " ericonr
2020-07-27 13:25 ` sgn
2020-07-27 13:28 ` ericonr
2020-07-27 13:29 ` ericonr
2020-07-27 13:36 ` [PR REVIEW] " ahesford
2020-07-27 13:36 ` ahesford
2021-07-07 21:24 ` jirutka
2021-07-07 21:55 ` ahesford
2021-07-07 22:47 ` jirutka
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=20200601035752.oHft1dIU4AsX-FfPeRZsr4pLSEh5NRJHkJj9ghOxQmE@z \
--to=ericonr@users.noreply.github.com \
--cc=ml@inbox.vuxu.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;
as well as URLs for NNTP newsgroup(s).