diff options
Diffstat (limited to 'sys-kernel/dracut')
| -rw-r--r-- | sys-kernel/dracut/Manifest | 2 | ||||
| -rw-r--r-- | sys-kernel/dracut/files/057-i18n-keymaps.patch | 28 | ||||
| -rw-r--r-- | sys-kernel/dracut/files/057-virtiofs-split-usr.patch | 43 |
3 files changed, 0 insertions, 73 deletions
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 9bdb64ebc01c..35e92893a9a5 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1,5 +1,3 @@ -AUX 057-i18n-keymaps.patch 1364 BLAKE2B 6805d459d7c6327b8f421a6853c6d1d91d29729231ff60a8dfc9a4fae1860cb385aec3c860079ad2e53af6c8d773be2e152422b1883a1e6be574c580cc9733e5 SHA512 818e59e7d2173b63c0b30eeeadcfb3f92409c8697d5581c77b9e5ba9669b585fc0cdad416dcc511da52ca0149a3abe7763d2654198763a6d08a1fbfce38295a9 -AUX 057-virtiofs-split-usr.patch 1556 BLAKE2B 292293bce43e899491001664c21d9fc2795d8e8221187c557fb9d74ab3fb7f91aa72d1bcd7c6750a834e7d8ebace27483f2c799353c9857adef2144fe7a5384a SHA512 a61cdfebcfaa9320af669c20589bb5c260c31c8d1cfd330751dbad6bea8e5b07f384ae43b4b9ab3390d233091872f38bbb11f23ec44e2c3fc6b263268d2ae56a AUX 059-gawk.patch 1349 BLAKE2B a4c778afb4bded425fd578a4b5b93f4a83924148e64b7ef3c68967626eaa1072b322b3c6ee87dcfcae013ecb12869f3d51977926357cab83cb3404dcecba5787 SHA512 a50e1b74186450fafb3f396c11744b964d67923740627c88d381b0041e3b870a5fea6df8c2119d67ecfdd560d8ea26bf72fea7e7ab70b4fae9e8d035d72d0fe0 AUX 059-kernel-install-uki.patch 5396 BLAKE2B fe6ecd2b6a3b549cc2f54bd9f933495cd081761b960528a7cf3fcdecf441057325d03e32b0f04f6bf5698ce225892cc841484d4925a66d9f3e4f4b9e59dd4e2a SHA512 08ab3b47a6f4a0507ec12647ced54cf64a20d2df4b7653aa1882c9184be53b9cc8290854c2d3bd84888b0a22105d3e513d9e019d232db82bdd1a888bf50f3212 AUX 059-uefi-split-usr.patch 1567 BLAKE2B 6abde1671c49e6314e181747ff504f50b7d6d1c9268f5f93a859edfdbbe823f48e33287dfa426b33f2dc967f1895d5499460e9bb865731e784a658d350ba7a3f SHA512 d1b27993003e5da1634a7e287a42ee0c4b8789a411024472e1b8b5a9923d94788dfe0bc4b48da9071bf62bb857aedbb18a5be7324e6d4c0919b329d85cc6b160 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> |