Skip to content
This repository was archived by the owner on May 20, 2023. It is now read-only.

Commit 918507b

Browse files
grazzolinisvntogit
authored andcommitted
upgpkg: mkinitcpio 31-3
git-svn-id: file:///srv/repos/svn-packages/svn@449914 eb2447ed-0c53-47e4-bac8-5bc4a241df78
1 parent f2c84d5 commit 918507b

File tree

3 files changed

+143
-7
lines changed

3 files changed

+143
-7
lines changed
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001
2+
From: Chih-Hsuan Yen <yan12125@gmail.com>
3+
Date: Sun, 3 Jul 2022 11:03:10 +0800
4+
Subject: [PATCH] Fix the warning about missing modules.builtin.modinfo
5+
6+
> 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
7+
8+
kmod wants modules.builtin.modinfo since v30 [1].
9+
10+
Also adds modules.order as suggested by heftig. That file is used (if
11+
exists) since the first commit of depmod.
12+
13+
[1] https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=0246e06340df292b5dda4bc00e24cc9ae894e881
14+
---
15+
functions | 2 +-
16+
1 file changed, 1 insertion(+), 1 deletion(-)
17+
18+
diff --git a/functions b/functions
19+
index 48cfd7a..e77a4c4 100644
20+
--- a/functions
21+
+++ b/functions
22+
@@ -876,7 +876,7 @@ install_modules() {
23+
(( ${#zst_comp[*]} )) && zstd -d --rm -q "${zst_comp[@]}"
24+
25+
msg "Generating module dependencies"
26+
- install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.builtin
27+
+ install -m644 -t "$moduledest" "$_d_kmoduledir"/modules.{builtin,builtin.modinfo,order}
28+
29+
# we install all modules into kernel/, making the .order file incorrect for
30+
# the module tree. munge it, so that we have an accurate index. This avoids
31+
--
32+
2.37.0
33+

trunk/PKGBUILD

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
pkgname=mkinitcpio
66
pkgver=31
7-
pkgrel=2
7+
pkgrel=3
88
pkgdesc="Modular initramfs image creation utility"
99
arch=('any')
1010
url='https://github.com/archlinux/mkinitcpio'
@@ -19,17 +19,22 @@ optdepends=('gzip: Use gzip compression for the initramfs image'
1919
'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
2020
provides=('initramfs')
2121
backup=('etc/mkinitcpio.conf')
22-
source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
22+
source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
23+
0001-Fix-the-warning-about-missing-modules.builtin.modinf.patch)
2324
install=mkinitcpio.install
2425
sha512sums=('4ef87c2e4f579b292c38f9c487e78b3b99f6db77909cab322e860e5ca70aca3747fcfc272e2e15c9a3605c924ab178057b8b23151f98debc5d96e65f3c0c49d5'
25-
'SKIP')
26+
'SKIP'
27+
'fd348d6fcff249672b495db50fa67ce06d5d9a0c8f749c8b488bc1e4b43c9b850a5ad87392230fbe8b715422bb14e760bb0ad219cfcf1d7e132c6a7e4dd118a6')
2628
b2sums=('0113e288906e3b5fa485c29c00e7df60d85addd96718c45531031a686f18c739fa18303b6cac374d35b85edb7b663e221c8dc9158dff08c75858a4ed4dd154bf'
27-
'SKIP')
29+
'SKIP'
30+
'5a05cee0382284d6cc0a2033e872b7c4c9f01ddfe6d3550974b5eab9a8a18690d1115b57d8d08153497fed08fd55b69f8b4a4cbcbe67795d615cc06ea7c86618')
2831
validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB') # Giancarlo Razzolini
2932

30-
# prepare() {
31-
# cd $pkgname-$pkgver
32-
# }
33+
prepare() {
34+
cd $pkgname-$pkgver
35+
patch -Np1 < "$srcdir"/0001-Fix-the-warning-about-missing-modules.builtin.modinf.patch
36+
37+
}
3338

3439
check() {
3540
make -C "$pkgname-$pkgver" check
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2+
3+
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
96+
lxA=
97+
=G2V7
98+
-----END PGP PUBLIC KEY BLOCK-----

0 commit comments

Comments
 (0)