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 (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A5755158042 for ; Sat, 9 Nov 2024 14:31:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C5D8DE088A; Sat, 9 Nov 2024 14:31:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 A6F29E088A for ; Sat, 9 Nov 2024 14:31:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 AEF0033BE32 for ; Sat, 9 Nov 2024 14:31:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2255F197F for ; Sat, 9 Nov 2024 14:31:53 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1731162691.6fb3d4afd50ab9a7054258e6bb78ea8364b8801a.andrewammerlaan@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-105-r1.ebuild sys-kernel/dracut/dracut-105-r2.ebuild sys-kernel/dracut/files/dracut-105-fix-check_kernel_module.patch X-VCS-Directories: sys-kernel/dracut/ sys-kernel/dracut/files/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 6fb3d4afd50ab9a7054258e6bb78ea8364b8801a X-VCS-Branch: master Date: Sat, 9 Nov 2024 14:31:53 +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: e2869db7-2f78-49d3-b779-d63c01ce26a2 X-Archives-Hash: 717ffe750aad8c95cb0a010934f9c2c8 commit: 6fb3d4afd50ab9a7054258e6bb78ea8364b8801a Author: Nowa Ammerlaan gentoo org> AuthorDate: Sat Nov 9 14:31:31 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Sat Nov 9 14:31:31 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fb3d4af sys-kernel/dracut: backport fix for checking kmods Signed-off-by: Nowa Ammerlaan gentoo.org> .../{dracut-105-r1.ebuild => dracut-105-r2.ebuild} | 2 ++ .../files/dracut-105-fix-check_kernel_module.patch | 28 ++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/sys-kernel/dracut/dracut-105-r1.ebuild b/sys-kernel/dracut/dracut-105-r2.ebuild similarity index 98% rename from sys-kernel/dracut/dracut-105-r1.ebuild rename to sys-kernel/dracut/dracut-105-r2.ebuild index 70692cd367a4..743a246869b9 100644 --- a/sys-kernel/dracut/dracut-105-r1.ebuild +++ b/sys-kernel/dracut/dracut-105-r2.ebuild @@ -101,6 +101,8 @@ PATCHES=( "${FILESDIR}"/${PN}-103-acct-user-group-gentoo.patch # https://github.com/dracut-ng/dracut-ng/pull/834 "${FILESDIR}"/${PN}-105-ensure-abs-args-for-objcopy.patch + # https://github.com/dracut-ng/dracut-ng/pull/904 + "${FILESDIR}"/${PN}-105-fix-check_kernel_module.patch ) src_configure() { diff --git a/sys-kernel/dracut/files/dracut-105-fix-check_kernel_module.patch b/sys-kernel/dracut/files/dracut-105-fix-check_kernel_module.patch new file mode 100644 index 000000000000..e1fc7924c303 --- /dev/null +++ b/sys-kernel/dracut/files/dracut-105-fix-check_kernel_module.patch @@ -0,0 +1,28 @@ +From b90eda4b431af23d1101f1ea68b656929c6a82b2 Mon Sep 17 00:00:00 2001 +From: Nowa Ammerlaan +Date: Fri, 8 Nov 2024 20:01:54 +0100 +Subject: [PATCH] fix(dracut-functions.sh): check for modules in --kmoddir, not + in --sysroot + +Modules are installed from the directory specified by --kmoddir, but currently +the check_kernel_module() function is checking for the module in +--sysroot/lib/modules. This is notably not the same when kernels packages are +being built inside some docker container. We should check for the modules +existence in the directory we are actually going to install it from. +--- + dracut-functions.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dracut-functions.sh b/dracut-functions.sh +index 865c31290..245c69cb6 100755 +--- a/dracut-functions.sh ++++ b/dracut-functions.sh +@@ -761,7 +761,7 @@ check_kernel_config() { + # 0 if the kernel module is either built-in or available + # 1 if the kernel module is not enabled + check_kernel_module() { +- modprobe -d "$dracutsysrootdir" -S "$kernel" --dry-run "$1" &> /dev/null || return 1 ++ modprobe -d "$drivers_dir/../../" -S "$kernel" --dry-run "$1" &> /dev/null || return 1 + } + + # get_cpu_vendor