Date: Friday, August 16, 2019 @ 18:28:02 Author: eschwartz Revision: 499887
update arch-detection patch to make use of pacman-conf pacman 5.1 is a thing, now Modified: debootstrap/trunk/PKGBUILD debootstrap/trunk/arch-detect.patch -------------------+ PKGBUILD | 2 +- arch-detect.patch | 31 +++++++++++++++++++++---------- 2 files changed, 22 insertions(+), 11 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-08-16 15:43:24 UTC (rev 499886) +++ PKGBUILD 2019-08-16 18:28:02 UTC (rev 499887) @@ -14,7 +14,7 @@ 'debian-archive-keyring: check release signatures for Debian' 'ubuntu-keyring: check release signatures for Ubuntu') sha512sums=('36310ae320abce915fa39204a92a90bcbf8ebee864a550097fef2266df64c510304cc220d56bd4a092fa3b3f43864931170f8b25ca7ae585e0018d7a44f3c1df' - '56e25f48027f99f7e720859a9e14fe769b1cbd6227c7a7e27e14c2fea88520109342d6e5b127dc34ce8cc40f46941a0c5157ad35cf8ef9b3e4323877a4b32d97') + 'd70a9d096d1692f71970cc818515bd783a6031bfe2d2857134eabf6fd36e4137152ebafa8e2d4ae7c8cb442c8532cd4192715b286e38b4d947b0b467e9ed54a5') prepare() { cd debootstrap-$pkgver Modified: arch-detect.patch =================================================================== --- arch-detect.patch 2019-08-16 15:43:24 UTC (rev 499886) +++ arch-detect.patch 2019-08-16 18:28:02 UTC (rev 499887) @@ -1,21 +1,32 @@ +From b15594e90a8de4a9cd844bc80388e7b64fc4a51a Mon Sep 17 00:00:00 2001 +From: Eli Schwartz <eschwa...@archlinux.org> +Date: Fri, 16 Aug 2019 14:20:19 -0400 +Subject: [PATCH] add pacman capability to debootstrap architecture detection + +--- + debootstrap | 9 +++++++++ + 1 file changed, 9 insertions(+) + diff --git a/debootstrap b/debootstrap -index fcdb20f..184900d 100755 +index 29c0443..f9d49a9 100755 --- a/debootstrap +++ b/debootstrap -@@ -427,6 +427,16 @@ elif in_path udpkg && \ +@@ -506,6 +506,15 @@ elif in_path udpkg && \ 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')" -+ case "$CARCH" in -+ "i686") HOST_ARCH="i386" ;; -+ "x86_64") HOST_ARCH="amd64" ;; -+ "armv7h") HOST_ARCH="armhf" ;; -+ "aarch64") HOST_ARCH="arm64" ;; ++elif in_path pacman-conf; then ++ CARCH=$(pacman-conf Architecture) ++ case $CARCH in ++ i686) HOST_ARCH=i386 ;; ++ x86_64) HOST_ARCH=amd64 ;; ++ armv7h) HOST_ARCH=armhf ;; ++ aarch64) HOST_ARCH=arm64 ;; + *) echo "Unknown architecture: $CARCH" && exit 1 + esac fi HOST_OS="$HOST_ARCH" # basic host OS guessing for non-Debian systems +-- +2.22.1 +