diff options
Diffstat (limited to 'libre/debootstrap/arch-detect.patch')
-rw-r--r-- | libre/debootstrap/arch-detect.patch | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/libre/debootstrap/arch-detect.patch b/libre/debootstrap/arch-detect.patch index 20e5ff682..821580358 100644 --- a/libre/debootstrap/arch-detect.patch +++ b/libre/debootstrap/arch-detect.patch @@ -1,18 +1,21 @@ ---- a/debootstrap 2016-03-22 21:13:58.000000000 +0800 -+++ b/debootstrap 2016-03-22 21:13:09.573621800 +0800 -@@ -419,6 +419,15 @@ +diff --git a/debootstrap b/debootstrap +index fcdb20f..184900d 100755 +--- 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` +elif in_path pacman; then -+ CARCH="$(. /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" ;; -+ *) echo "Unknown architecture: $CARCH" && exit 1 -+ esac ++ # 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" ;; ++ *) echo "Unknown architecture: $CARCH" && exit 1 ++ esac fi HOST_OS="$HOST_ARCH" # basic host OS guessing for non-Debian systems |