From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 576F5158094 for ; Tue, 5 Jul 2022 14:30:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7221CE0AD6; Tue, 5 Jul 2022 14:30:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5CFD4E0AD6 for ; Tue, 5 Jul 2022 14:30:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 79483341806 for ; Tue, 5 Jul 2022 14:30:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D877B326 for ; Tue, 5 Jul 2022 14:30:22 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1657031421.c3f71cf8081924f8cb0a4f2d2a2ba630fe9056a1.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/, sys-kernel/dracut/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/dracut/dracut-057-r1.ebuild sys-kernel/dracut/dracut-057.ebuild sys-kernel/dracut/files/057-i18n-keymaps.patch X-VCS-Directories: sys-kernel/dracut/ sys-kernel/dracut/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: c3f71cf8081924f8cb0a4f2d2a2ba630fe9056a1 X-VCS-Branch: master Date: Tue, 5 Jul 2022 14:30:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 54c88da5-64cc-4e59-91f7-c6b82f5aaf2c X-Archives-Hash: 70ad6bd01f6a8f7c6ef477e1e41bbdca commit: c3f71cf8081924f8cb0a4f2d2a2ba630fe9056a1 Author: Mike Gilbert gentoo org> AuthorDate: Tue Jul 5 14:27:31 2022 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Jul 5 14:30:21 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f71cf8 sys-kernel/dracut: fix issue with keymaps Signed-off-by: Mike Gilbert gentoo.org> .../{dracut-057.ebuild => dracut-057-r1.ebuild} | 1 + sys-kernel/dracut/files/057-i18n-keymaps.patch | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/sys-kernel/dracut/dracut-057.ebuild b/sys-kernel/dracut/dracut-057-r1.ebuild similarity index 99% rename from sys-kernel/dracut/dracut-057.ebuild rename to sys-kernel/dracut/dracut-057-r1.ebuild index 2e0def4acdca..fd44dcda247d 100644 --- a/sys-kernel/dracut/dracut-057.ebuild +++ b/sys-kernel/dracut/dracut-057-r1.ebuild @@ -63,6 +63,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*" PATCHES=( "${FILESDIR}"/gentoo-ldconfig-paths-r1.patch "${FILESDIR}"/057-virtiofs-split-usr.patch + "${FILESDIR}"/057-i18n-keymaps.patch ) src_configure() { diff --git a/sys-kernel/dracut/files/057-i18n-keymaps.patch b/sys-kernel/dracut/files/057-i18n-keymaps.patch new file mode 100644 index 000000000000..77ac6078fb07 --- /dev/null +++ b/sys-kernel/dracut/files/057-i18n-keymaps.patch @@ -0,0 +1,28 @@ +From bef99c5120809cc5603e51dcc1987767205f241f Mon Sep 17 00:00:00 2001 +From: Antonio Alvarez Feijoo +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