Date: Friday, October 6, 2017 @ 19:29:31 Author: dreisner Revision: 307063
upgpkg: mkinitcpio 24-2 - fix handling of MODULES in early config (FS#55870) Added: mkinitcpio/trunk/0001-Restore-addition-of-modules-from-config-file.patch Modified: mkinitcpio/trunk/PKGBUILD ---------------------------------------------------------+ 0001-Restore-addition-of-modules-from-config-file.patch | 39 ++++++++++++++ PKGBUILD | 14 +++-- 2 files changed, 50 insertions(+), 3 deletions(-) Added: 0001-Restore-addition-of-modules-from-config-file.patch =================================================================== --- 0001-Restore-addition-of-modules-from-config-file.patch (rev 0) +++ 0001-Restore-addition-of-modules-from-config-file.patch 2017-10-06 19:29:31 UTC (rev 307063) @@ -0,0 +1,39 @@ +From 5bba09cb1c661627fde76b977cfe9f937b1264a3 Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreis...@archlinux.org> +Date: Fri, 6 Oct 2017 08:15:43 -0400 +Subject: [mkinitcpio] [PATCH] Restore addition of modules from config file + +Broken by c5ad00c2. + +ref: https://bugs.archlinux.org/task/55870 +--- + functions | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/functions b/functions +index 1486f2f..ba95e80 100644 +--- a/functions ++++ b/functions +@@ -627,9 +627,18 @@ parse_config() { + map add_file "${FILES[@]}" + + tee "$BUILDROOT/buildconfig" < "$1" | { ++ # When MODULES is not an array (but instead implicitly converted at ++ # startup), sourcing the config causes the string value of MODULES ++ # to be assigned as MODULES[0]. Avoid this by explicitly unsetting ++ # MODULES before re-sourcing the config. ++ unset MODULES ++ + . /dev/stdin + +- for mod in "${modules[@]%\?}"; do ++ # arrayize MODULES if necessary. ++ [[ ${MODULES@a} != *a* ]] && read -ra MODULES <<<"${MODULES//-/_}" ++ ++ for mod in "${MODULES[@]%\?}"; do + mod=${mod//-/_} + # only add real modules (2 == builtin) + (( _addedmodules["$mod"] == 1 )) && add+=("$mod") +-- +2.14.2 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-10-06 19:20:31 UTC (rev 307062) +++ PKGBUILD 2017-10-06 19:29:31 UTC (rev 307063) @@ -4,7 +4,7 @@ pkgname=mkinitcpio pkgver=24 -pkgrel=1 +pkgrel=2 pkgdesc="Modular initramfs image creation utility" arch=('any') url="https://projects.archlinux.org/mkinitcpio.git/" @@ -17,13 +17,21 @@ 'lz4: Use lz4 compression for the initramfs image' 'mkinitcpio-nfs-utils: Support for root filesystem on NFS') backup=('etc/mkinitcpio.conf') -source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} + 0001-Restore-addition-of-modules-from-config-file.patch) install=mkinitcpio.install sha256sums=('ec0ecbc518c14ecacf5a8ece2f068fe86fcaf3aed09ee6b82737e773e5d7d02b' - 'SKIP') + 'SKIP' + 'd4cbbf7b05f5dcaf23139469376ff6c29e948ce77a8c51ad4867413b4bddc4db') validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53' # Dave Reisner '86CFFCA918CF3AF47147588051E8B148A9999C34') # Evangelos Foutras +prepare() { + cd "$pkgname-$pkgver" + + patch -Np1 <"$srcdir"/0001-Restore-addition-of-modules-from-config-file.patch +} + check() { make -C "$pkgname-$pkgver" check }