From ff39c912d412717d17232de9564f659b037e95b5 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 5 Aug 2022 08:25:04 -0400 Subject: [PATCH] mkinitcpio: backport fix for kmod>=30 --- srcpkgs/mkinitcpio/patches/fix-depmod.patch | 30 +++++++++++++++++++++ srcpkgs/mkinitcpio/template | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/mkinitcpio/patches/fix-depmod.patch diff --git a/srcpkgs/mkinitcpio/patches/fix-depmod.patch b/srcpkgs/mkinitcpio/patches/fix-depmod.patch new file mode 100644 index 00000000000..55e5e7bb3a1 --- /dev/null +++ b/srcpkgs/mkinitcpio/patches/fix-depmod.patch @@ -0,0 +1,30 @@ +From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001 +From: Chih-Hsuan Yen +Date: Sun, 3 Jul 2022 11:03:10 +0800 +Subject: [PATCH] Fix the warning about missing modules.builtin.modinfo + +> depmod: WARNING: could not open modules.builtin.modinfo at /tmp/mkinitcpio.EftMSK/root/lib/modules/5.15.52-1-lts: No such file or directory + +kmod wants modules.builtin.modinfo since v30 [1]. + +Also adds modules.order as suggested by heftig. That file is used (if +exists) since the first commit of depmod. + +[1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=0246e06340df292b5dda4bc00e24cc9ae894e881 +--- + functions | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/functions b/functions +index 48cfd7a..e77a4c4 100644 +--- a/functions ++++ b/functions +@@ -876,7 +876,7 @@ install_modules() { + (( ${#zst_comp[*]} )) && zstd -d --rm -q "${zst_comp[@]}" + + msg "Generating module dependencies" +- install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.builtin ++ install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.{builtin,builtin.modinfo,order} + + # we install all modules into kernel/, making the .order file incorrect for + # the module tree. munge it, so that we have an accurate index. This avoids diff --git a/srcpkgs/mkinitcpio/template b/srcpkgs/mkinitcpio/template index ddd733d5e56..ab00be349a2 100644 --- a/srcpkgs/mkinitcpio/template +++ b/srcpkgs/mkinitcpio/template @@ -1,7 +1,7 @@ # Template file for 'mkinitcpio' pkgname=mkinitcpio version=31 -revision=1 +revision=2 build_style=gnu-makefile hostmakedepends="asciidoc" depends="busybox-static bsdtar bash"