Date: Monday, February 24, 2020 @ 19:57:11 Author: grazzolini Revision: 376157
upgpkg: mkinitcpio 27-3 Fix for kmod's FS#65564 Added: mkinitcpio/trunk/0002-mkinitcpio-fix-builtin.patch Modified: mkinitcpio/trunk/PKGBUILD -----------------------------------+ 0002-mkinitcpio-fix-builtin.patch | 29 +++++++++++++++++++++++++++++ PKGBUILD | 11 ++++++++--- 2 files changed, 37 insertions(+), 3 deletions(-) Added: 0002-mkinitcpio-fix-builtin.patch =================================================================== --- 0002-mkinitcpio-fix-builtin.patch (rev 0) +++ 0002-mkinitcpio-fix-builtin.patch 2020-02-24 19:57:11 UTC (rev 376157) @@ -0,0 +1,29 @@ +From 30dbfc2770cb49cb3babfb750205b126d7d88791 Mon Sep 17 00:00:00 2001 +From: Morten Linderud <[email protected]> +Date: Thu, 20 Feb 2020 09:44:29 +0100 +Subject: [PATCH] [functions] Ignore modinfo built-in modules + +modinfo have started reporting filenames as "(builtin)" on built-in +modules. Ignore these and continue with other modules. + +Fixes: https://bugs.archlinux.org/task/65564 +Introduced in: https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/commit/?id=e7e2cb61fa9f1db3429d91ef6accff549500d268 + +Signed-off-by: Morten Linderud <[email protected]> +--- + functions | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/functions b/functions +index f407c82..1c72b56 100644 +--- a/functions ++++ b/functions +@@ -371,7 +371,7 @@ add_module() { + target=${1%.ko*} target=${target//-/_} + + # skip expensive stuff if this module has already been added +- (( _addedmodules["$target"] == 1 )) && return ++ (( _addedmodules["$target"] > 0 )) && return + + while IFS=':= ' read -r -d '' field value; do + case "$field" in Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-02-24 19:41:48 UTC (rev 376156) +++ PKGBUILD 2020-02-24 19:57:11 UTC (rev 376157) @@ -4,7 +4,7 @@ pkgname=mkinitcpio pkgver=27 -pkgrel=2 +pkgrel=3 pkgdesc="Modular initramfs image creation utility" arch=('any') url="https://projects.archlinux.org/mkinitcpio.git/"; @@ -19,11 +19,13 @@ provides=('initramfs') backup=('etc/mkinitcpio.conf') source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} - "0001-mkinitcpio-remove-preset-pacsave.patch") + "0001-mkinitcpio-remove-preset-pacsave.patch" + "0002-mkinitcpio-fix-builtin.patch") install=mkinitcpio.install sha256sums=('e6bff1cb78b677538eb9aace900b715fd59de8fc210b74fb9d899dfaa32bc354' 'SKIP' - '845569fa760f70c868ecb3dc8ae9667287970526dddaf403fdafcb716e8b3d51') + '845569fa760f70c868ecb3dc8ae9667287970526dddaf403fdafcb716e8b3d51' + 'd097f3df15ba9fefd3771f9f784e1c31c8d5ff1d9d6885a46fc6b5188e419796') validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53' # Dave Reisner '86CFFCA918CF3AF47147588051E8B148A9999C34' # Evangelos Foutras 'ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB') # Giancarlo Razzolini @@ -32,6 +34,9 @@ cd $pkgname-$pkgver # Apply 0001-mkinitcpio-remove-preset-pacsave.patch patch -Np1 < $srcdir/0001-mkinitcpio-remove-preset-pacsave.patch + + # Apply 0002-mkinitcpio-fix-builtin.patch + patch -Np1 < $srcdir/0002-mkinitcpio-fix-builtin.patch } check() {
