[arch-commits] Commit in mkinitcpio/repos (5 files)

[Giancarlo Razzolini]

    Date: Tuesday, July 5, 2022 @ 14:01:38
  Author: grazzolini
Revision: 449915

archrelease: copy trunk to testing-any

Added:
  mkinitcpio/repos/testing-any/
  mkinitcpio/repos/testing-any/0001-Fix-the-warning-about-missing-modules.builtin.modinf.patch
    (from rev 449914, mkinitcpio/trunk/0001-Fix-the-warning-about-missing-modules.builtin.modinf.patch)
  mkinitcpio/repos/testing-any/PKGBUILD
    (from rev 449914, mkinitcpio/trunk/PKGBUILD)
  mkinitcpio/repos/testing-any/keys/
  mkinitcpio/repos/testing-any/mkinitcpio.install
    (from rev 449914, mkinitcpio/trunk/mkinitcpio.install)

-----------------------------------------------------------------+
 0001-Fix-the-warning-about-missing-modules.builtin.modinf.patch |   33 +++++++
 PKGBUILD                                                        |   45 ++++++++++
 mkinitcpio.install                                              |   15 +++
 3 files changed, 93 insertions(+)

Copied: mkinitcpio/repos/testing-any/0001-Fix-the-warning-about-missing-modules.builtin.modinf.patch (from rev 449914, mkinitcpio/trunk/0001-Fix-the-warning-about-missing-modules.builtin.modinf.patch)
===================================================================
--- testing-any/0001-Fix-the-warning-about-missing-modules.builtin.modinf.patch	                        (rev 0)
+++ testing-any/0001-Fix-the-warning-about-missing-modules.builtin.modinf.patch	2022-07-05 14:01:38 UTC (rev 449915)
@@ -0,0 +1,33 @@
+From e629e34f18141a6244eaac2f0288d7b2a5d669ee Mon Sep 17 00:00:00 2001
+From: Chih-Hsuan Yen <yan12125 at gmail.com>
+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
+-- 
+2.37.0
+

Copied: mkinitcpio/repos/testing-any/PKGBUILD (from rev 449914, mkinitcpio/trunk/PKGBUILD)
===================================================================
--- testing-any/PKGBUILD	                        (rev 0)
+++ testing-any/PKGBUILD	2022-07-05 14:01:38 UTC (rev 449915)
@@ -0,0 +1,45 @@
+# Maintainer: Giancarlo Razzolini <grazzolini at archlinux.org>
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+# Maintainer: Thomas Bächler <thomas at archlinux.org>
+
+pkgname=mkinitcpio
+pkgver=31
+pkgrel=3
+pkgdesc="Modular initramfs image creation utility"
+arch=('any')
+url='https://github.com/archlinux/mkinitcpio'
+license=('GPL')
+depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' 'coreutils'
+         'bash' 'binutils' 'diffutils' 'findutils' 'grep' 'filesystem>=2011.10-1' 'zstd' 'systemd')
+optdepends=('gzip: Use gzip compression for the initramfs image'
+            'xz: Use lzma or xz compression for the initramfs image'
+            'bzip2: Use bzip2 compression for the initramfs image'
+            'lzop: Use lzo compression for the initramfs image'
+            'lz4: Use lz4 compression for the initramfs image'
+            'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
+provides=('initramfs')
+backup=('etc/mkinitcpio.conf')
+source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+       0001-Fix-the-warning-about-missing-modules.builtin.modinf.patch)
+install=mkinitcpio.install
+sha512sums=('4ef87c2e4f579b292c38f9c487e78b3b99f6db77909cab322e860e5ca70aca3747fcfc272e2e15c9a3605c924ab178057b8b23151f98debc5d96e65f3c0c49d5'
+            'SKIP'
+            'fd348d6fcff249672b495db50fa67ce06d5d9a0c8f749c8b488bc1e4b43c9b850a5ad87392230fbe8b715422bb14e760bb0ad219cfcf1d7e132c6a7e4dd118a6')
+b2sums=('0113e288906e3b5fa485c29c00e7df60d85addd96718c45531031a686f18c739fa18303b6cac374d35b85edb7b663e221c8dc9158dff08c75858a4ed4dd154bf'
+        'SKIP'
+        '5a05cee0382284d6cc0a2033e872b7c4c9f01ddfe6d3550974b5eab9a8a18690d1115b57d8d08153497fed08fd55b69f8b4a4cbcbe67795d615cc06ea7c86618')
+validpgpkeys=('ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB')    # Giancarlo Razzolini
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 < "$srcdir"/0001-Fix-the-warning-about-missing-modules.builtin.modinf.patch  
+   
+}
+
+check() {
+  make -C "$pkgname-$pkgver" check
+}
+
+package() {
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}

Copied: mkinitcpio/repos/testing-any/mkinitcpio.install (from rev 449914, mkinitcpio/trunk/mkinitcpio.install)
===================================================================
--- testing-any/mkinitcpio.install	                        (rev 0)
+++ testing-any/mkinitcpio.install	2022-07-05 14:01:38 UTC (rev 449915)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+post_upgrade() {
+  if [ "$(vercmp 0.9.0 "$2")" -eq 1 ]; then
+    printf '==> If your /usr is on a separate partition, you must add the "usr" hook\n'
+    printf '    to /etc/mkinitcpio.conf and regenerate your images before rebooting\n'
+  fi
+
+  if [ "$(vercmp 0.12.0 "$2")" -eq 1 ]; then
+    printf '==> The "block" hook has replaced several hooks:\n'
+    printf '       fw, sata, pata, scsi, virtio, mmc, usb\n'
+    printf '    Replace any and all of these in /etc/mkinitcpio.conf with a single\n'
+    printf '    instance of the "block" hook\n'
+  fi
+}