| 1 |
commit: c3f71cf8081924f8cb0a4f2d2a2ba630fe9056a1 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jul 5 14:27:31 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jul 5 14:30:21 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f71cf8 |
| 7 |
|
| 8 |
sys-kernel/dracut: fix issue with keymaps |
| 9 |
|
| 10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 11 |
|
| 12 |
.../{dracut-057.ebuild => dracut-057-r1.ebuild} | 1 + |
| 13 |
sys-kernel/dracut/files/057-i18n-keymaps.patch | 28 ++++++++++++++++++++++ |
| 14 |
2 files changed, 29 insertions(+) |
| 15 |
|
| 16 |
diff --git a/sys-kernel/dracut/dracut-057.ebuild b/sys-kernel/dracut/dracut-057-r1.ebuild |
| 17 |
similarity index 99% |
| 18 |
rename from sys-kernel/dracut/dracut-057.ebuild |
| 19 |
rename to sys-kernel/dracut/dracut-057-r1.ebuild |
| 20 |
index 2e0def4acdca..fd44dcda247d 100644 |
| 21 |
--- a/sys-kernel/dracut/dracut-057.ebuild |
| 22 |
+++ b/sys-kernel/dracut/dracut-057-r1.ebuild |
| 23 |
@@ -63,6 +63,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*" |
| 24 |
PATCHES=( |
| 25 |
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch |
| 26 |
"${FILESDIR}"/057-virtiofs-split-usr.patch |
| 27 |
+ "${FILESDIR}"/057-i18n-keymaps.patch |
| 28 |
) |
| 29 |
|
| 30 |
src_configure() { |
| 31 |
|
| 32 |
diff --git a/sys-kernel/dracut/files/057-i18n-keymaps.patch b/sys-kernel/dracut/files/057-i18n-keymaps.patch |
| 33 |
new file mode 100644 |
| 34 |
index 000000000000..77ac6078fb07 |
| 35 |
--- /dev/null |
| 36 |
+++ b/sys-kernel/dracut/files/057-i18n-keymaps.patch |
| 37 |
@@ -0,0 +1,28 @@ |
| 38 |
+From bef99c5120809cc5603e51dcc1987767205f241f Mon Sep 17 00:00:00 2001 |
| 39 |
+From: Antonio Alvarez Feijoo <antonio.feijoo@××××.com> |
| 40 |
+Date: Mon, 27 Jun 2022 13:19:41 +0200 |
| 41 |
+Subject: [PATCH] fix(i18n): add required includes for keymaps |
| 42 |
+ |
| 43 |
+Commit https://github.com/dracutdevs/dracut/commit/f3441cc7 removed shell |
| 44 |
+options but didn't adapt all the code that requires nullglob and globstar. |
| 45 |
+This caused the initrd to be generated without the required includes for |
| 46 |
+keymaps. |
| 47 |
+--- |
| 48 |
+ modules.d/10i18n/module-setup.sh | 4 +++- |
| 49 |
+ 1 file changed, 3 insertions(+), 1 deletion(-) |
| 50 |
+ |
| 51 |
+diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh |
| 52 |
+index 35bda36fb..6fd5fd433 100755 |
| 53 |
+--- a/modules.d/10i18n/module-setup.sh |
| 54 |
++++ b/modules.d/10i18n/module-setup.sh |
| 55 |
+@@ -63,7 +63,9 @@ install() { |
| 56 |
+ readarray -t INCLUDES < <("$CMD" '^include ' "$MAP" | while read -r _ a _ || [ -n "$a" ]; do echo "${a//\"/}"; done) |
| 57 |
+ |
| 58 |
+ for INCL in "${INCLUDES[@]}"; do |
| 59 |
+- for FN in "$dracutsysrootdir""${kbddir}"/keymaps/**/"$INCL"*; do |
| 60 |
++ local -a FNS |
| 61 |
++ mapfile -t -d '' FNS < <(find "${dracutsysrootdir}${kbddir}"/keymaps/ -type f -name "${INCL}*" -print0) |
| 62 |
++ for FN in "${FNS[@]}"; do |
| 63 |
+ [[ -f $FN ]] || continue |
| 64 |
+ [[ -v KEYMAPS["$FN"] ]] || findkeymap "$FN" |
| 65 |
+ done |
Archives