summaryrefslogtreecommitdiff
path: root/nonsystemd
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-03-03 22:46:48 -0300
committerDavid P <megver83@parabola.nu>2020-03-03 22:46:48 -0300
commit8b34f5ca49bb3cd1ec06408c7cfbc92d4a928e7e (patch)
tree816a9301787e969d0e9a71571ec0eab872ddaffd /nonsystemd
parent92906e1d9f33e55ab2bb75390e787281650cb6eb (diff)
downloadabslibre-8b34f5ca49bb3cd1ec06408c7cfbc92d4a928e7e.tar.gz
abslibre-8b34f5ca49bb3cd1ec06408c7cfbc92d4a928e7e.tar.bz2
abslibre-8b34f5ca49bb3cd1ec06408c7cfbc92d4a928e7e.zip
updpkg: nonsystemd/mkinitcpio 27-3.nonsystemd1
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'nonsystemd')
-rw-r--r--nonsystemd/mkinitcpio/0002-mkinitcpio-fix-builtin.patch29
-rw-r--r--nonsystemd/mkinitcpio/PKGBUILD11
2 files changed, 37 insertions, 3 deletions
diff --git a/nonsystemd/mkinitcpio/0002-mkinitcpio-fix-builtin.patch b/nonsystemd/mkinitcpio/0002-mkinitcpio-fix-builtin.patch
new file mode 100644
index 000000000..3ee8d1f4f
--- /dev/null
+++ b/nonsystemd/mkinitcpio/0002-mkinitcpio-fix-builtin.patch
@@ -0,0 +1,29 @@
+From 30dbfc2770cb49cb3babfb750205b126d7d88791 Mon Sep 17 00:00:00 2001
+From: Morten Linderud <morten@linderud.pw>
+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 <morten@linderud.pw>
+---
+ 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
diff --git a/nonsystemd/mkinitcpio/PKGBUILD b/nonsystemd/mkinitcpio/PKGBUILD
index b54addc30..82b98616e 100644
--- a/nonsystemd/mkinitcpio/PKGBUILD
+++ b/nonsystemd/mkinitcpio/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=mkinitcpio
pkgver=27
-pkgrel=2
+pkgrel=3
pkgrel+=.nonsystemd1
pkgdesc="Modular initramfs image creation utility"
arch=('any')
@@ -22,12 +22,14 @@ provides=('initramfs')
backup=('etc/mkinitcpio.conf')
source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
nosystemd.patch
- "0001-mkinitcpio-remove-preset-pacsave.patch")
+ "0001-mkinitcpio-remove-preset-pacsave.patch"
+ "0002-mkinitcpio-fix-builtin.patch")
install=mkinitcpio.install
sha256sums=('e6bff1cb78b677538eb9aace900b715fd59de8fc210b74fb9d899dfaa32bc354'
'SKIP'
'c4afeb6b3300c4d50c3f01233705b542f59d6e95a7670f7efde097ea209ef5bd'
- '845569fa760f70c868ecb3dc8ae9667287970526dddaf403fdafcb716e8b3d51')
+ '845569fa760f70c868ecb3dc8ae9667287970526dddaf403fdafcb716e8b3d51'
+ 'd097f3df15ba9fefd3771f9f784e1c31c8d5ff1d9d6885a46fc6b5188e419796')
validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53' # Dave Reisner
'86CFFCA918CF3AF47147588051E8B148A9999C34' # Evangelos Foutras
'ECCAC84C1BA08A6CC8E63FBBF22FB1D78A77AEAB') # Giancarlo Razzolini
@@ -39,6 +41,9 @@ prepare(){
rm -rf install/sd-*
patch -Np1 -i $srcdir/nosystemd.patch
+
+ # Apply 0002-mkinitcpio-fix-builtin.patch
+ patch -Np1 < $srcdir/0002-mkinitcpio-fix-builtin.patch
}
check() {