* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/
@ 2022-07-19 17:10 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2022-07-19 17:10 UTC (permalink / raw
To: gentoo-commits
commit: 5c5c921230d528d1cc6955593196793b231ef71b
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jul 19 15:31:52 2022 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 17:08:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5c9212
sys-kernel/dracut: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Portage 3.0.32 / pkgdev 0.2.1 / pkgcheck 0.10.11
Closes: https://github.com/gentoo/gentoo/pull/26476
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
sys-kernel/dracut/files/053-network-manager.patch | 24 -------------
.../dracut/files/gentoo-ldconfig-paths.patch | 39 ----------------------
2 files changed, 63 deletions(-)
diff --git a/sys-kernel/dracut/files/053-network-manager.patch b/sys-kernel/dracut/files/053-network-manager.patch
deleted file mode 100644
index c3b337733b7f..000000000000
--- a/sys-kernel/dracut/files/053-network-manager.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ba4bcf5f4f11ad624c647ddf4f566997186135e7 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 31 Mar 2021 16:11:41 +0200
-Subject: [PATCH] fix(network-manager): no default deps for nm-run.service
-
-Otherwise nm-run.service will run only in basic.target, which is too
-late in the initramfs.
----
- modules.d/35network-manager/nm-run.service | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/modules.d/35network-manager/nm-run.service b/modules.d/35network-manager/nm-run.service
-index 63fe7564d0..f3493c41a3 100644
---- a/modules.d/35network-manager/nm-run.service
-+++ b/modules.d/35network-manager/nm-run.service
-@@ -2,6 +2,8 @@
- # SPDX-License-Identifier: GPL-2.0-or-later
-
- [Unit]
-+DefaultDependencies=no
-+
- #make sure all devices showed up
- Wants=systemd-udev-settle.service
- After=systemd-udev-settle.service
diff --git a/sys-kernel/dracut/files/gentoo-ldconfig-paths.patch b/sys-kernel/dracut/files/gentoo-ldconfig-paths.patch
deleted file mode 100644
index 15522ef4fc1e..000000000000
--- a/sys-kernel/dracut/files/gentoo-ldconfig-paths.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0674b9136831b1beb6a7ec91147fd5c280c693a3 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Mon, 9 Mar 2020 02:47:07 +0300
-Subject: [PATCH] Remove redundant gcc paths in ldconfig_paths()
-
-Bug: https://bugs.gentoo.org/705728
----
- dracut-functions.sh | 15 ++++++++++++++-
- 1 file changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 3cb9c7af..5337ff6c 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -76,7 +76,20 @@ find_binary() {
-
- ldconfig_paths()
- {
-- $DRACUT_LDCONFIG ${dracutsysrootdir:+-r ${dracutsysrootdir} -f /etc/ld.so.conf} -pN 2>/dev/null | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | sed -n 's,.* => \(.*\)/.*,\1,p' | sort | uniq
-+ local gccpath
-+
-+ if type -P gcc-config &>/dev/null; then
-+ gccpath=$(gcc-config -c)
-+ gccpath=/usr/lib/gcc/${gccpath%-*}/${gccpath##*-}
-+ fi
-+
-+ while read -r line; do
-+ if [[ ${line} != /usr/lib/gcc/* || -z ${gccpath} ]]; then
-+ echo ${line}
-+ elif [[ ${line} == ${gccpath} ]]; then
-+ echo ${line}
-+ fi
-+ done < <($DRACUT_LDCONFIG ${dracutsysrootdir:+-r ${dracutsysrootdir} -f /etc/ld.so.conf} -pN 2>/dev/null | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | sed -n 's,.* => \(.*\)/.*,\1,p' | sort | uniq)
- }
-
- # Version comparision function. Assumes Linux style version scheme.
---
-2.24.1
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/
@ 2023-11-24 17:36 Ulrich Müller
0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Müller @ 2023-11-24 17:36 UTC (permalink / raw
To: gentoo-commits
commit: 50cac65c50d1d8bc84a04ecee45f7d3cd7098a50
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Nov 23 17:19:28 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 17:36:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50cac65c
sys-kernel/dracut: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
sys-kernel/dracut/files/057-i18n-keymaps.patch | 28 --------------
.../dracut/files/057-virtiofs-split-usr.patch | 43 ----------------------
2 files changed, 71 deletions(-)
diff --git a/sys-kernel/dracut/files/057-i18n-keymaps.patch b/sys-kernel/dracut/files/057-i18n-keymaps.patch
deleted file mode 100644
index 77ac6078fb07..000000000000
--- a/sys-kernel/dracut/files/057-i18n-keymaps.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bef99c5120809cc5603e51dcc1987767205f241f Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Mon, 27 Jun 2022 13:19:41 +0200
-Subject: [PATCH] fix(i18n): add required includes for keymaps
-
-Commit https://github.com/dracutdevs/dracut/commit/f3441cc7 removed shell
-options but didn't adapt all the code that requires nullglob and globstar.
-This caused the initrd to be generated without the required includes for
-keymaps.
----
- modules.d/10i18n/module-setup.sh | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
-index 35bda36fb..6fd5fd433 100755
---- a/modules.d/10i18n/module-setup.sh
-+++ b/modules.d/10i18n/module-setup.sh
-@@ -63,7 +63,9 @@ install() {
- readarray -t INCLUDES < <("$CMD" '^include ' "$MAP" | while read -r _ a _ || [ -n "$a" ]; do echo "${a//\"/}"; done)
-
- for INCL in "${INCLUDES[@]}"; do
-- for FN in "$dracutsysrootdir""${kbddir}"/keymaps/**/"$INCL"*; do
-+ local -a FNS
-+ mapfile -t -d '' FNS < <(find "${dracutsysrootdir}${kbddir}"/keymaps/ -type f -name "${INCL}*" -print0)
-+ for FN in "${FNS[@]}"; do
- [[ -f $FN ]] || continue
- [[ -v KEYMAPS["$FN"] ]] || findkeymap "$FN"
- done
diff --git a/sys-kernel/dracut/files/057-virtiofs-split-usr.patch b/sys-kernel/dracut/files/057-virtiofs-split-usr.patch
deleted file mode 100644
index 5bb51a9b3535..000000000000
--- a/sys-kernel/dracut/files/057-virtiofs-split-usr.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From dd63cc0a25f9fb34a2f28306c06a668d66564463 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 4 Jul 2022 19:08:45 -0400
-Subject: [PATCH] fix(virtiofs): make shebangs work on split-usr systems
-
-Fixes: c29325a982013a315418cdb2318e90cf77e387b5
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- modules.d/95virtiofs/module-setup.sh | 2 +-
- modules.d/95virtiofs/mount-virtiofs.sh | 2 +-
- modules.d/95virtiofs/parse-virtiofs.sh | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/95virtiofs/module-setup.sh b/modules.d/95virtiofs/module-setup.sh
-index e5f209e0a..70c10584a 100755
---- a/modules.d/95virtiofs/module-setup.sh
-+++ b/modules.d/95virtiofs/module-setup.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/bash
-+#!/bin/bash
-
- # called by dracut
- check() {
-diff --git a/modules.d/95virtiofs/mount-virtiofs.sh b/modules.d/95virtiofs/mount-virtiofs.sh
-index 507911cf5..c7e31d041 100755
---- a/modules.d/95virtiofs/mount-virtiofs.sh
-+++ b/modules.d/95virtiofs/mount-virtiofs.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/sh
-+#!/bin/sh
-
- if [ "${fstype}" = "virtiofs" -o "${root%%:*}" = "virtiofs" ]; then
- if ! { modprobe virtiofs || strstr "$(cat /proc/filesystems)" virtiofs; }; then
-diff --git a/modules.d/95virtiofs/parse-virtiofs.sh b/modules.d/95virtiofs/parse-virtiofs.sh
-index 8b8cf760d..760e41385 100755
---- a/modules.d/95virtiofs/parse-virtiofs.sh
-+++ b/modules.d/95virtiofs/parse-virtiofs.sh
-@@ -1,4 +1,4 @@
--#!/usr/bin/sh
-+#!/bin/sh
- # Accepted formats:
- # rootfstype=virtiofs root=<tag>
- # root=virtiofs:<tag>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/
@ 2024-10-05 14:41 Andrew Ammerlaan
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Ammerlaan @ 2024-10-05 14:41 UTC (permalink / raw
To: gentoo-commits
commit: 0c6c7b3d766e1fbecb185294183753ca84de3d55
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Oct 4 15:19:33 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Oct 5 14:41:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c6c7b3d
sys-kernel/dracut: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/38879
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
sys-kernel/dracut/files/059-gawk.patch | 35 -----
.../dracut/files/059-kernel-install-uki.patch | 150 ---------------------
sys-kernel/dracut/files/059-systemd-executor.patch | 31 -----
sys-kernel/dracut/files/059-systemd-pcrphase.patch | 91 -------------
sys-kernel/dracut/files/059-uefi-split-usr.patch | 48 -------
sys-kernel/dracut/files/059-uki-systemd-254.patch | 134 ------------------
.../dracut/files/dracut-059-dmsquash-live.patch | 26 ----
sys-kernel/dracut/files/gentoo-network-r1.patch | 29 ----
8 files changed, 544 deletions(-)
diff --git a/sys-kernel/dracut/files/059-gawk.patch b/sys-kernel/dracut/files/059-gawk.patch
deleted file mode 100644
index 5f1da79bb24a..000000000000
--- a/sys-kernel/dracut/files/059-gawk.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2436
-
-From 77214c229dadd1441f0d6243221ceed0708cbfcf Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Thu, 20 Jul 2023 04:36:01 +0100
-Subject: [PATCH] fix(dracut.sh): use gawk for strtonum
-
-strtonum is a gawkism and is not available in all awks, e.g. mawk. Use gawk
-to avoid failure.
-
-Fixes: f32e95bcadbc5158843530407adc1e7b700561b1
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -1047,7 +1047,7 @@ pe_file_format() {
- if [[ $# -eq 1 ]]; then
- local magic
- magic=$(objdump -p "$1" \
-- | awk '{if ($1 == "Magic"){print strtonum("0x"$2)}}')
-+ | gawk '{if ($1 == "Magic"){print strtonum("0x"$2)}}')
- magic=$(printf "0x%x" "$magic")
- # 0x10b (PE32), 0x20b (PE32+)
- [[ $magic == 0x20b || $magic == 0x10b ]] && return 0
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -2467,7 +2467,7 @@ if [[ $uefi == yes ]]; then
- fi
- fi
-
-- offs=$(objdump -h "$uefi_stub" 2> /dev/null | awk 'NF==7 {size=strtonum("0x"$3);\
-+ offs=$(objdump -h "$uefi_stub" 2> /dev/null | gawk 'NF==7 {size=strtonum("0x"$3);\
- offset=strtonum("0x"$4)} END {print size + offset}')
- if [[ $offs -eq 0 ]]; then
- dfatal "Failed to get the size of $uefi_stub to create UEFI image file"
-
diff --git a/sys-kernel/dracut/files/059-kernel-install-uki.patch b/sys-kernel/dracut/files/059-kernel-install-uki.patch
deleted file mode 100644
index 9bbf3574b7a2..000000000000
--- a/sys-kernel/dracut/files/059-kernel-install-uki.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-Combination of:
-- https://github.com/dracutdevs/dracut/pull/2405
-- https://github.com/dracutdevs/dracut/pull/2495
-- https://github.com/dracutdevs/dracut/pull/2521
-
-Fixes installing manually configured kernel in uki layout and
-allows dropping workaround from dist-kernel-utils.eclass
-
-Provides compatibility with systemd-254's ukify plugin
-
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -2594,6 +2594,9 @@ freeze_ok_for_fstype() {
- zfs)
- return 1
- ;;
-+ tmpfs)
-+ return 1
-+ ;;
- btrfs)
- freeze_ok_for_btrfs "$outfile"
- ;;
---- a/install.d/50-dracut.install 2023-09-21 10:19:00.843827541 +0200
-+++ b/install.d/50-dracut.install 2023-07-20 16:53:51.000000000 +0200
-@@ -11,27 +11,69 @@
- exit 0
- fi
-
--if [[ -d "$BOOT_DIR_ABS" ]]; then
-- INITRD="initrd"
-+# Do not attempt to create initramfs if the supplied image is already a UKI
-+if [[ "$KERNEL_INSTALL_IMAGE_TYPE" = "uki" ]]; then
-+ exit 0
-+fi
-+
-+# Mismatching the install layout and the --uefi/--no-uefi opts just creates a mess.
-+if [[ $KERNEL_INSTALL_LAYOUT == "uki" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then
-+ BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
-+ if [[ -z $KERNEL_INSTALL_UKI_GENERATOR || $KERNEL_INSTALL_UKI_GENERATOR == "dracut" ]]; then
-+ # No uki generator preference set or we have been chosen
-+ IMAGE="uki.efi"
-+ UEFI_OPTS="--uefi"
-+ elif [[ -z $KERNEL_INSTALL_INITRD_GENERATOR || $KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then
-+ # We aren't the uki generator, but we have been requested to make the initrd
-+ IMAGE="initrd"
-+ UEFI_OPTS="--no-uefi"
-+ else
-+ exit 0
-+ fi
-+elif [[ $KERNEL_INSTALL_LAYOUT == "bls" && -n $KERNEL_INSTALL_STAGING_AREA ]]; then
-+ BOOT_DIR_ABS="$KERNEL_INSTALL_STAGING_AREA"
-+ if [[ -z $KERNEL_INSTALL_INITRD_GENERATOR || $KERNEL_INSTALL_INITRD_GENERATOR == "dracut" ]]; then
-+ IMAGE="initrd"
-+ UEFI_OPTS="--no-uefi"
-+ else
-+ exit 0
-+ fi
- else
-- BOOT_DIR_ABS="/boot"
-- INITRD="initramfs-${KERNEL_VERSION}.img"
-+ # No layout information, use users --uefi/--no-uefi preference
-+ UEFI_OPTS=""
-+ if [[ -d $BOOT_DIR_ABS ]]; then
-+ IMAGE="initrd"
-+ else
-+ BOOT_DIR_ABS="/boot"
-+ IMAGE="initramfs-${KERNEL_VERSION}.img"
-+ fi
- fi
-
- ret=0
-+
- case "$COMMAND" in
- add)
-- INITRD_IMAGE_PREGENERATED=${KERNEL_IMAGE%/*}/initrd
-- if [[ -f ${INITRD_IMAGE_PREGENERATED} ]]; then
-- # we found an initrd at the same place as the kernel
-+ if [[ $IMAGE == "uki.efi" ]]; then
-+ IMAGE_PREGENERATED=${KERNEL_IMAGE%/*}/uki.efi
-+ else
-+ IMAGE_PREGENERATED=${KERNEL_IMAGE%/*}/initrd
-+ fi
-+ if [[ -f ${IMAGE_PREGENERATED} ]]; then
-+ # we found an initrd or uki.efi at the same place as the kernel
- # use this and don't generate a new one
-- cp --reflink=auto "$INITRD_IMAGE_PREGENERATED" "$BOOT_DIR_ABS/$INITRD" \
-- && chown root:root "$BOOT_DIR_ABS/$INITRD" \
-- && chmod 0600 "$BOOT_DIR_ABS/$INITRD" \
-+ [[ $KERNEL_INSTALL_VERBOSE == 1 ]] && echo \
-+ "There is an ${IMAGE} image at the same place as the kernel, skipping generating a new one"
-+ cp --reflink=auto "$IMAGE_PREGENERATED" "$BOOT_DIR_ABS/$IMAGE" \
-+ && chown root:root "$BOOT_DIR_ABS/$IMAGE" \
-+ && chmod 0600 "$BOOT_DIR_ABS/$IMAGE" \
- && exit 0
- fi
-
-- if [[ -f /etc/kernel/cmdline ]]; then
-+ if [ -n "$KERNEL_INSTALL_CONF_ROOT" ]; then
-+ if [ -f "$KERNEL_INSTALL_CONF_ROOT/cmdline" ]; then
-+ read -r -d '' -a BOOT_OPTIONS < "$KERNEL_INSTALL_CONF_ROOT/cmdline"
-+ fi
-+ elif [[ -f /etc/kernel/cmdline ]]; then
- read -r -d '' -a BOOT_OPTIONS < /etc/kernel/cmdline
- elif [[ -f /usr/lib/kernel/cmdline ]]; then
- read -r -d '' -a BOOT_OPTIONS < /usr/lib/kernel/cmdline
-@@ -40,14 +82,14 @@
-
- read -r -d '' -a line < /proc/cmdline
- for i in "${line[@]}"; do
-- [[ "${i#initrd=*}" != "$i" ]] && continue
-+ [[ ${i#initrd=*} != "$i" ]] && continue
- BOOT_OPTIONS+=("$i")
- done
- fi
-
- unset noimageifnotneeded
-
-- for ((i=0; i < "${#BOOT_OPTIONS[@]}"; i++)); do
-+ for ((i = 0; i < "${#BOOT_OPTIONS[@]}"; i++)); do
- # shellcheck disable=SC1001
- if [[ ${BOOT_OPTIONS[$i]} == root\=PARTUUID\=* ]]; then
- noimageifnotneeded="yes"
-@@ -55,16 +97,21 @@
- fi
- done
-
-+ # shellcheck disable=SC2046
- dracut -f \
- ${noimageifnotneeded:+--noimageifnotneeded} \
-- $([[ "$KERNEL_INSTALL_VERBOSE" == 1 ]] && echo --verbose) \
-- "$BOOT_DIR_ABS/$INITRD" \
-- "$KERNEL_VERSION"
-+ $([[ $KERNEL_INSTALL_VERBOSE == 1 ]] && echo --verbose) \
-+ $([[ -n $KERNEL_IMAGE ]] && echo --kernel-image "$KERNEL_IMAGE") \
-+ "$UEFI_OPTS" \
-+ --kver "$KERNEL_VERSION" \
-+ "$BOOT_DIR_ABS/$IMAGE"
- ret=$?
-- ;;
-+ ;;
-+
- remove)
-- rm -f -- "$BOOT_DIR_ABS/$INITRD"
-+ rm -f -- "$BOOT_DIR_ABS/$IMAGE"
- ret=$?
-- ;;
-+ ;;
- esac
-+
- exit $ret
diff --git a/sys-kernel/dracut/files/059-systemd-executor.patch b/sys-kernel/dracut/files/059-systemd-executor.patch
deleted file mode 100644
index 5ec1a1386136..000000000000
--- a/sys-kernel/dracut/files/059-systemd-executor.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From bee1c4824a8cd47ce6c01892a548bdc07b1fa678 Mon Sep 17 00:00:00 2001
-From: Frantisek Sumsal <frantisek@sumsal.cz>
-Date: Sat, 14 Oct 2023 23:45:57 +0200
-Subject: [PATCH] feat(systemd): install systemd-executor
-
-In [0] systemd gained a new binary - systemd-executor - that's used to
-spawn processes forked off systemd. Let's copy it into the initrd if
-it's available.
-
-[0] https://github.com/systemd/systemd/pull/27890
-
-Signed-off-by: Brian Harring <ferringb@gmail.com>
----
- modules.d/00systemd/module-setup.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
-index 554c25a08..9a13a1dbb 100755
---- a/modules.d/00systemd/module-setup.sh
-+++ b/modules.d/00systemd/module-setup.sh
-@@ -34,6 +34,7 @@ install() {
- "$systemdutildir"/systemd \
- "$systemdutildir"/systemd-coredump \
- "$systemdutildir"/systemd-cgroups-agent \
-+ "$systemdutildir"/systemd-executor \
- "$systemdutildir"/systemd-shutdown \
- "$systemdutildir"/systemd-reply-password \
- "$systemdutildir"/systemd-fsck \
---
-2.41.0
-
diff --git a/sys-kernel/dracut/files/059-systemd-pcrphase.patch b/sys-kernel/dracut/files/059-systemd-pcrphase.patch
deleted file mode 100644
index f653cdd5907e..000000000000
--- a/sys-kernel/dracut/files/059-systemd-pcrphase.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2586
-
-From cd6f683d634970112a29867137431d0d57f8c957 Mon Sep 17 00:00:00 2001
-From: Antonio Alvarez Feijoo <antonio.feijoo@suse.com>
-Date: Thu, 9 Feb 2023 13:55:47 +0100
-Subject: [PATCH] fix(systemd-pcrphase): only include
- systemd-pcrphase-initrd.service
-
-The only systemd-pcrphase related unit configured to run in the initrd is
-systemd-pcrphase-initrd.service.
-Both systemd-pcrphase.service and systemd-pcrphase-sysinit.service contain
-`ConditionPathExists=!/etc/initrd-release`.
-
-Signed-off-by: Brian Harring <ferringb@gmail.com>
----
- modules.d/01systemd-pcrphase/module-setup.sh | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/modules.d/01systemd-pcrphase/module-setup.sh b/modules.d/01systemd-pcrphase/module-setup.sh
-index 3dbb4974..fa960a42 100755
---- a/modules.d/01systemd-pcrphase/module-setup.sh
-+++ b/modules.d/01systemd-pcrphase/module-setup.sh
-@@ -28,10 +28,6 @@ install() {
-
- inst_multiple -o \
- "$systemdutildir"/systemd-pcrphase \
-- "$systemdsystemunitdir"/systemd-pcrphase.service \
-- "$systemdsystemunitdir/systemd-pcrphase.service.d/*.conf" \
-- "$systemdsystemunitdir"/systemd-pcrphase-sysinit.service \
-- "$systemdsystemunitdir/systemd-pcrphase-sysinit.service/*.conf" \
- "$systemdsystemunitdir"/systemd-pcrphase-initrd.service \
- "$systemdsystemunitdir/systemd-pcrphase-initrd.service.d/*.conf" \
- "$systemdsystemunitdir"/initrd.target.wants/systemd-pcrphase-initrd.service
-@@ -39,10 +35,6 @@ install() {
- # Install the hosts local user configurations if enabled.
- if [[ $hostonly ]]; then
- inst_multiple -H -o \
-- "$systemdsystemconfdir"/systemd-pcrphase.service \
-- "$systemdsystemconfdir/systemd-pcrphase.service.d/*.conf" \
-- "$systemdsystemconfdir"/systemd-pcrphase-sysinit.service \
-- "$systemdsystemconfdir/systemd-pcrphase-sysinit.service.d/*.conf" \
- "$systemdsystemconfdir"/systemd-pcrphase-initrd.service \
- "$systemdsystemconfdir/systemd-pcrphase-initrd.service.d/*.conf" \
- "$systemdsystemconfdir"/initrd.target.wants/systemd-pcrphase-initrd.service
---
-2.41.0
-
-From cd93aaa2e096a8cbd1f1789dcce06857067b35c9 Mon Sep 17 00:00:00 2001
-From: Brian Harring <ferringb@gmail.com>
-Date: Mon, 11 Dec 2023 17:10:20 -0800
-Subject: [PATCH] fix(systemd-255): handle systemd-pcr{phase -> extend} rename
-
-The binary systemd-pcrphase was renamed to systemd-pcrextend
-in systemd 255, but the backing units were all left named
-systemd-pcrphase.
-
-Fixes: #2583
-
-Signed-off-by: Brian Harring <ferringb@gmail.com>
----
- modules.d/01systemd-pcrphase/module-setup.sh | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/01systemd-pcrphase/module-setup.sh b/modules.d/01systemd-pcrphase/module-setup.sh
-index fa960a42c..87efd0c1a 100755
---- a/modules.d/01systemd-pcrphase/module-setup.sh
-+++ b/modules.d/01systemd-pcrphase/module-setup.sh
-@@ -6,7 +6,11 @@
- check() {
-
- # If the binary(s) requirements are not fulfilled the module can't be installed.
-- require_binaries "$systemdutildir"/systemd-pcrphase || return 1
-+ # systemd-255 renamed the binary, check for old and new location.
-+ if ! require_binaries "$systemdutildir"/systemd-pcrphase && \
-+ ! require_binaries "$systemdutildir"/systemd-pcrextend; then
-+ return 1
-+ fi
-
- # Return 255 to only include the module, if another module requires it.
- return 255
-@@ -28,6 +32,7 @@ install() {
-
- inst_multiple -o \
- "$systemdutildir"/systemd-pcrphase \
-+ "$systemdutildir"/systemd-pcrextend \
- "$systemdsystemunitdir"/systemd-pcrphase-initrd.service \
- "$systemdsystemunitdir/systemd-pcrphase-initrd.service.d/*.conf" \
- "$systemdsystemunitdir"/initrd.target.wants/systemd-pcrphase-initrd.service
---
-2.41.0
-
diff --git a/sys-kernel/dracut/files/059-uefi-split-usr.patch b/sys-kernel/dracut/files/059-uefi-split-usr.patch
deleted file mode 100644
index 8adb88076130..000000000000
--- a/sys-kernel/dracut/files/059-uefi-split-usr.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://github.com/dracutdevs/dracut/pull/2365
-
-From 3462e0ac6f3562a5247bbeda2dc41eaf4e4ebf5e Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 26 May 2023 15:56:45 -0400
-Subject: [PATCH] Fix path to UEFI stub on split-usr systems
-
-systemd always installs the UEFI stub in ${prefix}/lib/systemd/boot/efi.
-
-On split-usr systems, systemdutildir is ${rootprefix}/lib/systemd, which
-makes dracut look in the wrong place.
-
-Instead, grab 'prefix' from systemd.pc and store it in 'systemd_prefix'.
-
-Bug: https://bugs.gentoo.org/765208
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- dracut.sh | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index bbb34697..52a83061 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1389,6 +1389,11 @@ esac
-
- abs_outfile=$(readlink -f "$outfile") && outfile="$abs_outfile"
-
-+[[ -n $systemd_prefix ]] \
-+ || systemd_prefix=$(pkg-config systemd --variable=prefix 2> /dev/null)
-+
-+[[ -n $systemd_prefix ]] || systemd_prefix=/usr
-+
- [[ -d $dracutsysrootdir$systemdutildir ]] \
- || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2> /dev/null)
-
-@@ -1467,7 +1472,7 @@ if [[ ! $print_cmdline ]]; then
- esac
-
- if ! [[ -s $uefi_stub ]]; then
-- uefi_stub="$dracutsysrootdir${systemdutildir}/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub"
-+ uefi_stub="$dracutsysrootdir${systemd_prefix}/lib/systemd/boot/efi/linux${EFI_MACHINE_TYPE_NAME}.efi.stub"
- fi
-
- if ! [[ -s $uefi_stub ]]; then
---
-2.40.1
-
diff --git a/sys-kernel/dracut/files/059-uki-systemd-254.patch b/sys-kernel/dracut/files/059-uki-systemd-254.patch
deleted file mode 100644
index e8b52480d030..000000000000
--- a/sys-kernel/dracut/files/059-uki-systemd-254.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-https://github.com/dracutdevs/dracut/issues/2431
-https://github.com/dracutdevs/dracut/commit/f32e95bcadbc5158843530407adc1e7b700561b1
-
-From f32e95bcadbc5158843530407adc1e7b700561b1 Mon Sep 17 00:00:00 2001
-From: Valentin Lefebvre <valentin.lefebvre@suse.com>
-Date: Mon, 13 Mar 2023 12:06:13 +0100
-Subject: [PATCH] fix(dracut.sh): use dynamically uefi's sections offset
-
-* Uefi section are creating by `objcopy` with hardcoded sections
-offset. This commit allow to have the correct offset between
-each part of the efi file, needed to create an UKI. Offsets
-are simply calculated so no sections overlap, as recommended
-in https://wiki.archlinux.org/title/Unified_kernel_image#Manually
-Moreover, efi stub file's header is parsed to apply the correct
-offsets according the section alignment factor.
-* Remove EFI_SECTION_VMA_INITRD, no need anymore as initrd
-section offset dynamically calculated
-
-Fixes dracutdevs#2275
-
-Signed-off-by: Valentin Lefebvre <valentin.lefebvre@suse.com>
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -1023,3 +1023,26 @@ get_dev_module() {
- fi
- echo "$dev_drivers"
- }
-+
-+# Check if file is in PE format
-+pe_file_format() {
-+ if [[ $# -eq 1 ]]; then
-+ local magic
-+ magic=$(objdump -p "$1" \
-+ | awk '{if ($1 == "Magic"){print strtonum("0x"$2)}}')
-+ magic=$(printf "0x%x" "$magic")
-+ # 0x10b (PE32), 0x20b (PE32+)
-+ [[ $magic == 0x20b || $magic == 0x10b ]] && return 0
-+ fi
-+ return 1
-+}
-+
-+# Get the sectionAlignment data from the PE header
-+pe_get_section_align() {
-+ local align_hex
-+ [[ $# -ne "1" ]] && return 1
-+ [[ $(pe_file_format "$1") -eq 1 ]] && return 1
-+ align_hex=$(objdump -p "$1" \
-+ | awk '{if ($1 == "SectionAlignment"){print $2}}')
-+ echo "$((16#$align_hex))"
-+}
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1506,7 +1506,6 @@ if [[ ! $print_cmdline ]]; then
- exit 1
- fi
- unset EFI_MACHINE_TYPE_NAME
-- EFI_SECTION_VMA_INITRD=0x3000000
- case "${DRACUT_ARCH:-$(uname -m)}" in
- x86_64)
- EFI_MACHINE_TYPE_NAME=x64
-@@ -1516,8 +1515,6 @@ if [[ ! $print_cmdline ]]; then
- ;;
- aarch64)
- EFI_MACHINE_TYPE_NAME=aa64
-- # aarch64 kernels are uncompressed and thus larger, so we need a bigger gap between vma sections
-- EFI_SECTION_VMA_INITRD=0x4000000
- ;;
- *)
- dfatal "Architecture '${DRACUT_ARCH:-$(uname -m)}' not supported to create a UEFI executable"
-@@ -2467,29 +2464,57 @@ if [[ $uefi == yes ]]; then
- fi
- fi
-
-+ offs=$(objdump -h "$uefi_stub" 2> /dev/null | awk 'NF==7 {size=strtonum("0x"$3);\
-+ offset=strtonum("0x"$4)} END {print size + offset}')
-+ if [[ $offs -eq 0 ]]; then
-+ dfatal "Failed to get the size of $uefi_stub to create UEFI image file"
-+ exit 1
-+ fi
-+ align=$(pe_get_section_align "$uefi_stub")
-+ if [[ $? -eq 1 ]]; then
-+ dfatal "Failed to get the sectionAlignment of the stub PE header to create the UEFI image file"
-+ exit 1
-+ fi
-+ offs=$((offs + "$align" - offs % "$align"))
-+ [[ -s $dracutsysrootdir/usr/lib/os-release ]] && uefi_osrelease="$dracutsysrootdir/usr/lib/os-release"
-+ [[ -s $dracutsysrootdir/etc/os-release ]] && uefi_osrelease="$dracutsysrootdir/etc/os-release"
-+ [[ -s $uefi_osrelease ]] \
-+ && uefi_osrelease_offs=${offs} \
-+ && offs=$((offs + $(stat -Lc%s "$uefi_osrelease"))) \
-+ && offs=$((offs + "$align" - offs % "$align"))
-+
- if [[ $kernel_cmdline ]] || [[ $hostonly_cmdline == yes && -e "${uefi_outdir}/cmdline.txt" ]]; then
- echo -ne "\x00" >> "$uefi_outdir/cmdline.txt"
- dinfo "Using UEFI kernel cmdline:"
- dinfo "$(tr -d '\000' < "$uefi_outdir/cmdline.txt")"
- uefi_cmdline="${uefi_outdir}/cmdline.txt"
-+ uefi_cmdline_offs=${offs}
-+ offs=$((offs + $(stat -Lc%s "$uefi_cmdline")))
-+ offs=$((offs + "$align" - offs % "$align"))
- else
- unset uefi_cmdline
- fi
-
-- [[ -s $dracutsysrootdir/usr/lib/os-release ]] && uefi_osrelease="$dracutsysrootdir/usr/lib/os-release"
-- [[ -s $dracutsysrootdir/etc/os-release ]] && uefi_osrelease="$dracutsysrootdir/etc/os-release"
- if [[ -s ${dracutsysrootdir}${uefi_splash_image} ]]; then
- uefi_splash_image="${dracutsysrootdir}${uefi_splash_image}"
-+ uefi_splash_offs=${offs}
-+ offs=$((offs + $(stat -Lc%s "$uefi_splash_image")))
-+ offs=$((offs + "$align" - offs % "$align"))
- else
- unset uefi_splash_image
- fi
-
-+ uefi_linux_offs="${offs}"
-+ offs=$((offs + $(stat -Lc%s "$kernel_image")))
-+ offs=$((offs + "$align" - offs % "$align"))
-+ uefi_initrd_offs="${offs}"
-+
- if objcopy \
-- ${uefi_osrelease:+--add-section .osrel="$uefi_osrelease" --change-section-vma .osrel=0x20000} \
-- ${uefi_cmdline:+--add-section .cmdline="$uefi_cmdline" --change-section-vma .cmdline=0x30000} \
-- ${uefi_splash_image:+--add-section .splash="$uefi_splash_image" --change-section-vma .splash=0x40000} \
-- --add-section .linux="$kernel_image" --change-section-vma .linux=0x2000000 \
-- --add-section .initrd="${DRACUT_TMPDIR}/initramfs.img" --change-section-vma .initrd="${EFI_SECTION_VMA_INITRD}" \
-+ ${uefi_osrelease:+--add-section .osrel="$uefi_osrelease" --change-section-vma .osrel=$(printf 0x%x "$uefi_osrelease_offs")} \
-+ ${uefi_cmdline:+--add-section .cmdline="$uefi_cmdline" --change-section-vma .cmdline=$(printf 0x%x "$uefi_cmdline_offs")} \
-+ ${uefi_splash_image:+--add-section .splash="$uefi_splash_image" --change-section-vma .splash=$(printf 0x%x "$uefi_splash_offs")} \
-+ --add-section .linux="$kernel_image" --change-section-vma .linux="$(printf 0x%x "$uefi_linux_offs")" \
-+ --add-section .initrd="${DRACUT_TMPDIR}/initramfs.img" --change-section-vma .initrd="$(printf 0x%x "$uefi_initrd_offs")" \
- "$uefi_stub" "${uefi_outdir}/linux.efi"; then
- if [[ -n ${uefi_secureboot_key} && -n ${uefi_secureboot_cert} ]]; then
- if sbsign \
diff --git a/sys-kernel/dracut/files/dracut-059-dmsquash-live.patch b/sys-kernel/dracut/files/dracut-059-dmsquash-live.patch
deleted file mode 100644
index 8061d686788b..000000000000
--- a/sys-kernel/dracut/files/dracut-059-dmsquash-live.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 19e4839ab70a691f95a0284aa0152a247eb5c63d Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Fri, 24 Feb 2023 01:57:19 +0000
-Subject: [PATCH] fix(dmsquash-live): restore compatibility with earlier
- releases
-
-Follow-up to 40dd5c90e0efcb9ebaa9abb42a38c7316e9706bd .
----
- modules.d/90dmsquash-live/dmsquash-live-root.sh | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
-index 62d1b5e7cd..a98e258c26 100755
---- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
-+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
-@@ -403,6 +403,10 @@ fi
-
- ROOTFLAGS="$(getarg rootflags)"
-
-+if [ "$overlayfs" = required ]; then
-+ echo "rd.live.overlay.overlayfs=1" > /etc/cmdline.d/dmsquash-need-overlay.conf
-+fi
-+
- if [ -n "$overlayfs" ]; then
- if [ -n "$FSIMG" ]; then
- mkdir -m 0755 -p /run/rootfsbase
diff --git a/sys-kernel/dracut/files/gentoo-network-r1.patch b/sys-kernel/dracut/files/gentoo-network-r1.patch
deleted file mode 100644
index 3d5db25cb0ae..000000000000
--- a/sys-kernel/dracut/files/gentoo-network-r1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5443396f3cb591f2589888b25e07f21f03989057 Mon Sep 17 00:00:00 2001
-From: Laszlo Gombos <laszlo.gombos@gmail.com>
-Date: Sat, 24 Dec 2022 01:48:04 +0000
-Subject: [PATCH] When no systemd then only network-legacy is supported
-
-Bug: https://github.com/dracutdevs/dracut/issues/1756
----
- modules.d/40network/module-setup.sh | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh
-index 1ab13ef..da49947 100755
---- a/modules.d/40network/module-setup.sh
-+++ b/modules.d/40network/module-setup.sh
-@@ -16,6 +16,11 @@ depends() {
- fi
- done
-
-+ # When systemd is not available only network-legacy is supported
-+ if [ -z "$network_handler" ] && ! find_binary systemctl > /dev/null; then
-+ network_handler="network-legacy"
-+ fi
-+
- if [ -z "$network_handler" ]; then
- if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then
- network_handler="network-wicked"
---
-2.34.1
-
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-10-05 14:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-05 14:41 [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2023-11-24 17:36 Ulrich Müller
2022-07-19 17:10 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox