summaryrefslogtreecommitdiff
path: root/sys-kernel/dracut
diff options
context:
space:
mode:
Diffstat (limited to 'sys-kernel/dracut')
-rw-r--r--sys-kernel/dracut/Manifest8
-rw-r--r--sys-kernel/dracut/files/059-gawk.patch35
-rw-r--r--sys-kernel/dracut/files/059-kernel-install-uki.patch150
-rw-r--r--sys-kernel/dracut/files/059-systemd-executor.patch31
-rw-r--r--sys-kernel/dracut/files/059-systemd-pcrphase.patch91
-rw-r--r--sys-kernel/dracut/files/059-uefi-split-usr.patch48
-rw-r--r--sys-kernel/dracut/files/059-uki-systemd-254.patch134
-rw-r--r--sys-kernel/dracut/files/dracut-059-dmsquash-live.patch26
-rw-r--r--sys-kernel/dracut/files/gentoo-network-r1.patch29
9 files changed, 0 insertions, 552 deletions
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 11433f3d710f..8980519ee8fe 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,10 +1,3 @@
-AUX 059-gawk.patch 1349 BLAKE2B a4c778afb4bded425fd578a4b5b93f4a83924148e64b7ef3c68967626eaa1072b322b3c6ee87dcfcae013ecb12869f3d51977926357cab83cb3404dcecba5787 SHA512 a50e1b74186450fafb3f396c11744b964d67923740627c88d381b0041e3b870a5fea6df8c2119d67ecfdd560d8ea26bf72fea7e7ab70b4fae9e8d035d72d0fe0
-AUX 059-kernel-install-uki.patch 5396 BLAKE2B fe6ecd2b6a3b549cc2f54bd9f933495cd081761b960528a7cf3fcdecf441057325d03e32b0f04f6bf5698ce225892cc841484d4925a66d9f3e4f4b9e59dd4e2a SHA512 08ab3b47a6f4a0507ec12647ced54cf64a20d2df4b7653aa1882c9184be53b9cc8290854c2d3bd84888b0a22105d3e513d9e019d232db82bdd1a888bf50f3212
-AUX 059-systemd-executor.patch 1117 BLAKE2B 387d2b1b0c438fac43a73b789b9c095963fbd4e3c26ddc78323c6fac4d3be7c826cd86b5d058764dbcd6986c7b6c8f429389cd2804e194896f5d56cf5fb7d663 SHA512 a62354fdb414e3e6a9ebde16d3730e70c28b5a107f1d4034fb2db6d3a3c8ba16708e0ecaf581174d3ded00cf69316182400cd121451169f485a986c94a434710
-AUX 059-systemd-pcrphase.patch 3894 BLAKE2B 9ae145a617130f8f49780c87f0d487453e77e8ef2835edec06eafff60de6dd58d89d61124e36c962a68323bf167543b68e6985806cb856a9ef76e39170c2175d SHA512 5bab5bf04468da113aa9289ed37753921745d33867af558f3ca24253dbaf528cb5af495fda8e000c29f5fb4c4dcbc49ac9e2f8466f1d7c0f407301bd38165af8
-AUX 059-uefi-split-usr.patch 1567 BLAKE2B 6abde1671c49e6314e181747ff504f50b7d6d1c9268f5f93a859edfdbbe823f48e33287dfa426b33f2dc967f1895d5499460e9bb865731e784a658d350ba7a3f SHA512 d1b27993003e5da1634a7e287a42ee0c4b8789a411024472e1b8b5a9923d94788dfe0bc4b48da9071bf62bb857aedbb18a5be7324e6d4c0919b329d85cc6b160
-AUX 059-uki-systemd-254.patch 6162 BLAKE2B 60d7fdb8189d26d30fa92c8964e0b6a26b7cfab3d07f006fdad60582fcfbad4a7e9aed91eb9443eafd2f325be59224896ef7dbfa83170c8968aeccf290eeb093 SHA512 83462ef22148ce75b2a94f72c89af6a135d6f8b41fc64fe7d6db3553b409105f1a65eba84727e23c44e3cd61cbc66c132ca5a0f5c103ad974747145fac8c3070
-AUX dracut-059-dmsquash-live.patch 936 BLAKE2B 6dcbc59561179bba5d7e998f901cda99d8deeeba15886c267e4f77033ab8308cf39b8aaa8ad4c99eca13b2689a052226fdbee6cdae370039bcf40f0e070a8c41 SHA512 34a1b34a09186fd05901f8114260170bf3a51cf96967aa58872c99d6bb1fb1673b8f0246171368837b88e0a1c83c5aac9c20e2f73ed88ed69df72362d55f911f
AUX dracut-059-install-new-systemd-hibernate-resume.service.patch 1048 BLAKE2B e2b2e2f8c92aa9ae42ce93e2423ffd30642caf05267faee84d02c7200527dd4bd1f31c76739f607d21d9799a69d68efa8457caed980efdf614151a454ed0fb3e SHA512 2ddfd57d8cca3b4564de6207471a47201edb13f9ba5598333874b976e1710e6e8fae910c35d7cf679dc023c82ec9aafad190b3953b0e73000e3531e9963a913f
AUX dracut-060-fix-resume-hostonly.patch 2670 BLAKE2B fc86da8dd8152c9d50480e302f06903bc0595449a12dbe2b8b34438df767284b0f7947b8d962312c1feb16ebd5fe0749f77191b0a22f42a4bfc0b12373be96be SHA512 d3bc3b1d5d3b71647846288b84b7b3dd8f8a1c0d2279a9373cd462202c82bc7d20e5eca585e2ae70f60fa93d8835ff3ec791a510b54b03e9b147d94068cd9663
AUX dracut-060-grub-layout.patch 1390 BLAKE2B a12a11dbbab0dc68bed954e154ae708ac7b2c2bdf56017278a6babd72ea532fc9bf0d00e7193dfaf2415daf6cfffea2ab119796136342997ec1ff251f5cbace1 SHA512 e6a54694c452dd4b8e053be004cb0f4011b2322580b3b72f1c59c689170de0bb7f14e87f581a0ebe5465c5beb5efcff33736c6c02003afdcf39db0aed2684d7a
@@ -13,7 +6,6 @@ AUX dracut-103-acct-user-group-gentoo.patch 915 BLAKE2B 75747b3775d04dd777d2a0f6
AUX dracut-103-always-install-libsystemd.patch 853 BLAKE2B d101e87231f09c376181a3b97d371dce218168d36d234f00e9aef526e03d7b1cfaea7bb7a275d3428649c4934b69c78ef645af027d7be90eb48af0dd4c64104a SHA512 413e9d95c613d0f6e21c89922b157af2e126ca581fbee070cd219e33915d38c288bc84a774103ce713a2e78d1453fcaecb07975d8b2df200bf0ce4cb33f2ee4e
AUX dracut-103-systemd-udev-256-kmod.patch 1616 BLAKE2B f1c15c4cd57d947f92f286c1fd9a4b045837017e965aa9b2707a15dea4426b0c349ad65e53f0b6a6e4dc7ddc999773a1af161cac2eac724d047a8d3109a8aeaa SHA512 359dfc2ee79d7647676c2b343f1b4bc23f11bc296c6b6c9be1525f87965be1ee8d4105f25dc6dc39dcdbca7a0d229a704a11416e7757739159493c6dc930f182
AUX gentoo-ldconfig-paths-r1.patch 1423 BLAKE2B e8bce9ee4b1b2546d4dbaa22a6167f9e3520df4f5f3b67509e430e4a6dd89d9fd18e53328c4bd6ee817e6b27ffcccf29fbdd922707c98f4fe67f6d44d76de2ff SHA512 fd44643e671d59ca51822d0f68b7ce7756035faca780ec784e64950770944f0aefd00a1dd2424f07568d5d97d46c0080c8e740856e0bff79bcf6a7e14b08ab8f
-AUX gentoo-network-r1.patch 1002 BLAKE2B 719ff76c315e29c2a40f0a485e315622d6678ef0a325681af22ca060189649119ce08024b1b81be02b28cf532d33165918f5707742bb9927abd08ce49ee0565d SHA512 694f493384e2c0b6a46508f2290efca78d1b6f742fe8441f970837280558d160a711e36ba835ca767cfd158bf191856017af146ae19c5aa1aecbd10a69be38a1
DIST dracut-060_pre20240104.tar.gz 499965 BLAKE2B 935e0e5da348426d69c6dab6b91078f126cadd9ffc6a32378e79cd93b1dbadff35899efc3786fc12bf5a6741843d3637b0c98cc71fe4a96a8caf053ae887bac3 SHA512 f7818265f082e9c05ebb81a91b67fb9b1d3bf8b2433b7e6ea9be6bee43d28cd1ee48577648e1d9b3729c17608b028d294c13bf5d4db4cc5a18e3b007eb2cd67e
DIST dracut-103.tar.gz 567713 BLAKE2B 7781c0b7fc83a2c0c461f6398687e053226b489fb5405b3132b30d8e7a4f3cea2bb73aa0fe6e4c4b27187d6270ba623f403916ec38025a912930ae347a7e25ce SHA512 ba0dbefbcbecb09c44ce240664bc4f4ee25dfb8be7bc060028ae3b1ccf7d70410491c105e64fcef3d6f44d2794cb6162bcea9404125906be46bf3dff098e0277
EBUILD dracut-060_pre20240104-r4.ebuild 4582 BLAKE2B 2e90c9669b95ccbdc38a3bedd131010d2f2fbf04a01a328e3579f0f5b34ef33d1fa4849c088440930c11b1b67c69ba543156a74d4499c0ab47741ef2b7666f49 SHA512 aaa83faf86aa3ac1be70cace1ffbe906508c935b8cc9928e59c1ea841d4846f5f6d78167cdd0b3c804aa0ca2b788606ff226bebec94c3e8747910d3b4949d307
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
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-04 15:11:27 +0000