diff options
| -rw-r--r-- | abs/core/mkinitcpio/0001-avoid-compound-conditional-leading-to-spurious-error.patch | 39 | ||||
| -rw-r--r-- | abs/core/mkinitcpio/PKGBUILD | 19 | ||||
| -rw-r--r-- | abs/core/mkinitcpio/__changelog | 1 |
3 files changed, 8 insertions, 51 deletions
diff --git a/abs/core/mkinitcpio/0001-avoid-compound-conditional-leading-to-spurious-error.patch b/abs/core/mkinitcpio/0001-avoid-compound-conditional-leading-to-spurious-error.patch deleted file mode 100644 index c1371fd..0000000 --- a/abs/core/mkinitcpio/0001-avoid-compound-conditional-leading-to-spurious-error.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ea4c4154205372154457c794513ae46b61ea4e4c Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@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 - diff --git a/abs/core/mkinitcpio/PKGBUILD b/abs/core/mkinitcpio/PKGBUILD index ad19b84..7b5b08d 100644 --- a/abs/core/mkinitcpio/PKGBUILD +++ b/abs/core/mkinitcpio/PKGBUILD @@ -3,13 +3,13 @@ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio -pkgver=18 -pkgrel=2 +pkgver=19 +pkgrel=1 pkgdesc="Modular initramfs image creation utility" arch=('any') url="https://projects.archlinux.org/mkinitcpio.git/" license=('GPL') -depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive' +depends=('awk' 'mkinitcpio-busybox>=1.19.4-2' 'kmod' 'util-linux>=2.23' 'libarchive>=3.1.2-10' 'coreutils' 'bash' 'findutils' 'grep' 'filesystem>=2011.10-1' 'gzip' 'systemd') optdepends=('xz: Use lzma or xz compression for the initramfs image' 'bzip2: Use bzip2 compression for the initramfs image' @@ -17,22 +17,17 @@ optdepends=('xz: Use lzma or xz compression for the initramfs image' '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} - '0001-avoid-compound-conditional-leading-to-spurious-error.patch' +source=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} 'mkinitcpio.patch') install=mkinitcpio.install - -prepare() { - patch -d "$pkgname-$pkgver" -Np1 <0001-avoid-compound-conditional-leading-to-spurious-error.patch -} +validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53' # Dave Reisner + '86CFFCA918CF3AF47147588051E8B148A9999C34') # Evangelos Foutras package() { make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install cd $pkgdir/etc patch -Np0 < $srcdir/mkinitcpio.patch || exit 1 - } -md5sums=('46b83483ac1444aa05a8d09e3bbc87b5' +md5sums=('e8b1d1059bd7f056cd4ee33706280f0f' 'SKIP' - 'd8c693935bd8f793cc410b78b3bfaf56' '031fd7d3013c26175ae7421781893feb') diff --git a/abs/core/mkinitcpio/__changelog b/abs/core/mkinitcpio/__changelog index 609b54f..a3d48dc 100644 --- a/abs/core/mkinitcpio/__changelog +++ b/abs/core/mkinitcpio/__changelog @@ -1 +1,2 @@ mkinitcpio.patch: update for new hooks +PKGBUILD: change dep for libarchive to libarchive>=3.1.2-10 |