Date: Thursday, May 17, 2018 @ 06:40:43 Author: felixonmars Revision: 323326
upgpkg: debootstrap 1.0.99-1 Modified: debootstrap/trunk/PKGBUILD debootstrap/trunk/arch-detect.patch -------------------+ PKGBUILD | 6 +++--- arch-detect.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-05-17 06:40:33 UTC (rev 323325) +++ PKGBUILD 2018-05-17 06:40:43 UTC (rev 323326) @@ -2,7 +2,7 @@ # Maintainer: Felix Yan <[email protected]> pkgname=debootstrap -pkgver=1.0.96 +pkgver=1.0.99 pkgrel=1 pkgdesc="Bootstrap a basic Debian system" arch=('any') @@ -14,8 +14,8 @@ optdepends=('gnupg: check release signatures' 'debian-archive-keyring: check release signatures for Debian' 'ubuntu-keyring: check release signatures for Ubuntu') -sha512sums=('f0cc0363aa122dfcff0c8b2853a0b1c7aaff052374842554fa7f1904bb9ded6fa0965850bbf3fdbfdefdd21b01dcb5710449d040c6292606f645370b7ced4a23' - '824109b2ea138d0dd1a31039a165cb4079da856cb11c664fc5a7f49a42de08ff56a620887d3c0914b69140849799f4473b1f27a05cd14cd60ef2a41627f8d5e1') +sha512sums=('011c38e1cf6d402032b8e44253fa278dd39bf19b90390a81be28eae2689dc0a46aefb06084eb75c770c7fdfc864e70e2b1b399c3fe02172ba5d9ef97b4348eb7' + '56e25f48027f99f7e720859a9e14fe769b1cbd6227c7a7e27e14c2fea88520109342d6e5b127dc34ce8cc40f46941a0c5157ad35cf8ef9b3e4323877a4b32d97') prepare() { cd debootstrap-$pkgver Modified: arch-detect.patch =================================================================== --- arch-detect.patch 2018-05-17 06:40:33 UTC (rev 323325) +++ arch-detect.patch 2018-05-17 06:40:43 UTC (rev 323326) @@ -3,9 +3,9 @@ --- a/debootstrap +++ b/debootstrap @@ -427,6 +427,16 @@ elif in_path udpkg && \ - HOST_ARCH=`/usr/bin/udpkg --print-architecture` - elif [ -e $DEBOOTSTRAP_DIR/arch ]; then - HOST_ARCH=`cat $DEBOOTSTRAP_DIR/arch` + HOST_ARCH=$(/usr/bin/udpkg --print-architecture) + elif [ -e "$DEBOOTSTRAP_DIR/arch" ]; then + HOST_ARCH=$(cat "$DEBOOTSTRAP_DIR/arch") +elif in_path pacman; then + # pacman 5.1 will have `pacman-conf Architecture` + CARCH="$(bash -c '. /etc/makepkg.conf && echo $CARCH')"
