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.fei...@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 <flop...@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 <flop...@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>
