sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysutils/debootstrap: make it work on arm64 without --arch

Browse source 
Reviewed By:	emaste
Sponsored By:	EPSRC
Differential Revision:	https://reviews.freebsd.org/D30127
This commit is contained in:
Edward Tomasz Napierala 2021-05-06 09:31:00 +01:00
parent 5041f74ee3
commit 0619a441a3
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysutils/debootstrap/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= debootstrap PORTNAME= debootstrap
PORTVERSION= 1.0.123 PORTVERSION= 1.0.123
PORTREVISION= 5 PORTREVISION= 6
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= DEBIAN MASTER_SITES= DEBIAN
DISTNAME= ${PORTNAME}_${PORTVERSION} DISTNAME= ${PORTNAME}_${PORTVERSION}

5
sysutils/debootstrap/files/patch-debootstrap
View file

@ -30,7 +30,7 @@
HOST_ARCH=$(cat "$DEBOOTSTRAP_DIR/arch") HOST_ARCH=$(cat "$DEBOOTSTRAP_DIR/arch")
fi fi
HOST_OS="$HOST_ARCH" HOST_OS="$HOST_ARCH"
@@ -542,6 +536,11 @@ if [ -z "$HOST_OS" ]; then @@ -542,6 +536,14 @@ if [ -z "$HOST_OS" ]; then
HOST_OS=freebsd HOST_OS=freebsd
;; ;;
esac esac
@ -38,6 +38,9 @@
+ +
+if [ "$HOST_OS" = "freebsd" -a -z "$HOST_ARCH" ]; then +if [ "$HOST_OS" = "freebsd" -a -z "$HOST_ARCH" ]; then
+ HOST_ARCH=`/sbin/sysctl -n hw.machine_arch` + HOST_ARCH=`/sbin/sysctl -n hw.machine_arch`
+ if [ "$HOST_ARCH" = "aarch64" ]; then
+ HOST_ARCH=arm64
+ fi
+ EXTRACTOR_OVERRIDE=ar + EXTRACTOR_OVERRIDE=ar
fi fi