Date: Friday, September 5, 2014 @ 14:56:09 Author: dreisner Revision: 220998
upgpkg: mkinitcpio 18-2 - backport fix for FS#41468 Added: mkinitcpio/trunk/0001-avoid-compound-conditional-leading-to-spurious-error.patch Modified: mkinitcpio/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-avoid-compound-conditional-leading-to-spurious-error.patch | 39 ++++++++++ PKGBUILD | 12 ++- 2 files changed, 48 insertions(+), 3 deletions(-) Added: 0001-avoid-compound-conditional-leading-to-spurious-error.patch =================================================================== --- 0001-avoid-compound-conditional-leading-to-spurious-error.patch (rev 0) +++ 0001-avoid-compound-conditional-leading-to-spurious-error.patch 2014-09-05 12:56:09 UTC (rev 220998) @@ -0,0 +1,39 @@ +From ea4c4154205372154457c794513ae46b61ea4e4c Mon Sep 17 00:00:00 2001 +From: Dave Reisner <dreis...@archlinux.org> +Date: Mon, 4 Aug 2014 08:31:37 -0400 +Subject: [mkinitcpio] [PATCH] avoid compound conditional leading to spurious + "errors" + +As seen: + +https://bbs.archlinux.org/viewtopic.php?id=185204 +https://bbs.archlinux.org/viewtopic.php?id=185265 +--- + functions | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/functions b/functions +index 20bbffe..362d07b 100644 +--- a/functions ++++ b/functions +@@ -423,11 +423,15 @@ add_full_dir() { + + for f in "$1"/*; do + if [[ -L $f ]]; then +- [[ $f = $filter ]] && add_symlink "$f" "$(readlink "$f")" ++ if [[ $f = $filter ]]; then ++ add_symlink "$f" "$(readlink "$f")" ++ fi + elif [[ -d $f ]]; then + add_full_dir "$f" + elif [[ -f $f ]]; then +- [[ $f = $filter ]] && add_file "$f" ++ if [[ $f = $filter ]]; then ++ add_file "$f" ++ fi + fi + done + fi +-- +2.1.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-09-05 09:01:12 UTC (rev 220997) +++ PKGBUILD 2014-09-05 12:56:09 UTC (rev 220998) @@ -4,7 +4,7 @@ pkgname=mkinitcpio pkgver=18 -pkgrel=1 +pkgrel=2 pkgdesc="Modular initramfs image creation utility" arch=('any') url="https://projects.archlinux.org/mkinitcpio.git/" @@ -17,11 +17,17 @@ 'lz4: Use lz4 compression for the initramfs image' 'mkinitcpio-nfs-utils: Support for root filesystem on NFS') backup=('etc/mkinitcpio.conf') -source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) +source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} + '0001-avoid-compound-conditional-leading-to-spurious-error.patch') install=mkinitcpio.install sha256sums=('187bdeeade08996010fbff480ccc91e47722d275c22fd6feb4a4b63061e9fc22' - 'SKIP') + 'SKIP' + 'f6a77a34a5d97b8c3f3aef21b97da0b5d6992244e28e9b3f71e83cbaa4473341') +prepare() { + patch -d "$pkgname-$pkgver" -Np1 <0001-avoid-compound-conditional-leading-to-spurious-error.patch +} + package() { make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install }