Date: Monday, September 4, 2017 @ 08:49:17
Author: bpiotrowski
Revision: 304644
archrelease: copy trunk to testing-any
Added:
mkinitcpio/repos/testing-any/
mkinitcpio/repos/testing-any/0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch
(from rev 304643,
mkinitcpio/trunk/0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch)
mkinitcpio/repos/testing-any/PKGBUILD
(from rev 304643, mkinitcpio/trunk/PKGBUILD)
mkinitcpio/repos/testing-any/mkinitcpio.install
(from rev 304643, mkinitcpio/trunk/mkinitcpio.install)
-----------------------------------------------------------------+
0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch | 31 +++++++
PKGBUILD | 40
++++++++++
mkinitcpio.install | 15 +++
3 files changed, 86 insertions(+)
Copied:
mkinitcpio/repos/testing-any/0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch
(from rev 304643,
mkinitcpio/trunk/0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch)
===================================================================
--- testing-any/0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch
(rev 0)
+++ testing-any/0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch
2017-09-04 08:49:17 UTC (rev 304644)
@@ -0,0 +1,31 @@
+From 32dbf895d07f07e32d2b3bb4afb132eea1919749 Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreis...@archlinux.org>
+Date: Mon, 21 Aug 2017 21:33:22 -0400
+Subject: [PATCH] make ldd parsing compatible with upstream glibc changes
+
+https://sourceware.org/git/?p=glibc.git;a=commit;h=eedca9772e99c72ab4c3c34e43cc764250aa3e3c
+---
+ functions | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/functions b/functions
+index 0e1fe0f..941312f 100644
+--- a/functions
++++ b/functions
+@@ -598,10 +598,10 @@ add_binary() {
+ ! lddout=$(ldd "$binary" 2>/dev/null) && return 0
+
+ # resolve sodeps
+- regex='(/.+) \(0x[a-fA-F0-9]+\)'
+- while read line; do
++ regex='^(|.+ )(/.+) \(0x[a-fA-F0-9]+\)'
++ while read -r line; do
+ if [[ $line =~ $regex ]]; then
+- sodep=${BASH_REMATCH[1]}
++ sodep=${BASH_REMATCH[2]}
+ elif [[ $line = *'not found' ]]; then
+ error "binary dependency \`%s' not found for \`%s'" "${line%% *}"
"$1"
+ (( ++_builderrors ))
+--
+2.14.1
+
Copied: mkinitcpio/repos/testing-any/PKGBUILD (from rev 304643,
mkinitcpio/trunk/PKGBUILD)
===================================================================
--- testing-any/PKGBUILD (rev 0)
+++ testing-any/PKGBUILD 2017-09-04 08:49:17 UTC (rev 304644)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Dave Reisner <dreis...@archlinux.org>
+# Maintainer: Thomas Bächler <tho...@archlinux.org>
+
+pkgname=mkinitcpio
+pkgver=23
+pkgrel=2
+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'
+ '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'
+ 'lzop: Use lzo 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=("https://sources.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+ '0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch')
+install=mkinitcpio.install
+sha256sums=('80f12a07f0dceef81dfe87200f099bd2149e0990391dda6defebaa5697f8a35a'
+ 'SKIP'
+ 'f534892af930abf8164eead271dc012e42a552362fbb459e55e04d4a68b52a66')
+validpgpkeys=('487EACC08557AD082088DABA1EB2638FF56C0C53' # Dave Reisner
+ '86CFFCA918CF3AF47147588051E8B148A9999C34') # Evangelos Foutras
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -p1 -i
../0001-make-ldd-parsing-compatible-with-upstream-glibc-chan.patch
+}
+
+check() {
+ make -C "$pkgname-$pkgver" check
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}
Copied: mkinitcpio/repos/testing-any/mkinitcpio.install (from rev 304643,
mkinitcpio/trunk/mkinitcpio.install)
===================================================================
--- testing-any/mkinitcpio.install (rev 0)
+++ testing-any/mkinitcpio.install 2017-09-04 08:49:17 UTC (rev 304644)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+post_upgrade() {
+ if [ "$(vercmp 0.9.0 "$2")" -eq 1 ]; then
+ printf '==> If your /usr is on a separate partition, you must add the
"usr" hook\n'
+ printf ' to /etc/mkinitcpio.conf and regenerate your images before
rebooting\n'
+ fi
+
+ if [ "$(vercmp 0.12.0 "$2")" -eq 1 ]; then
+ printf '==> The "block" hook has replaced several hooks:\n'
+ printf ' fw, sata, pata, scsi, virtio, mmc, usb\n'
+ printf ' Replace any and all of these in /etc/mkinitcpio.conf with a
single\n'
+ printf ' instance of the "block" hook\n'
+ fi
+}
