From owner-dev-commits-ports-all@freebsd.org Thu May 6 08:31:51 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 03DC563F03A; Thu, 6 May 2021 08:31:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FbRdL6knrz4RDW; Thu, 6 May 2021 08:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D9C5914EC1; Thu, 6 May 2021 08:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1468VoZe059092; Thu, 6 May 2021 08:31:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1468VoUH059091; Thu, 6 May 2021 08:31:50 GMT (envelope-from git) Date: Thu, 6 May 2021 08:31:50 GMT Message-Id: <202105060831.1468VoUH059091@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 0619a441a331 - main - sysutils/debootstrap: make it work on arm64 without --arch MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trasz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0619a441a3314f1513fd8e334d26d9a6a3d523b3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 May 2021 08:31:51 -0000 The branch main has been updated by trasz: URL: https://cgit.FreeBSD.org/ports/commit/?id=0619a441a3314f1513fd8e334d26d9a6a3d523b3 commit 0619a441a3314f1513fd8e334d26d9a6a3d523b3 Author: Edward Tomasz Napierala AuthorDate: 2021-05-06 08:31:00 +0000 Commit: Edward Tomasz Napierala CommitDate: 2021-05-06 08:31:10 +0000 sysutils/debootstrap: make it work on arm64 without --arch Reviewed By: emaste Sponsored By: EPSRC Differential Revision: https://reviews.freebsd.org/D30127 --- sysutils/debootstrap/Makefile | 2 +- sysutils/debootstrap/files/patch-debootstrap | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sysutils/debootstrap/Makefile b/sysutils/debootstrap/Makefile index d8934457e10e..f0b4d63438d4 100644 --- a/sysutils/debootstrap/Makefile +++ b/sysutils/debootstrap/Makefile @@ -2,7 +2,7 @@ PORTNAME= debootstrap PORTVERSION= 1.0.123 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= sysutils MASTER_SITES= DEBIAN DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/sysutils/debootstrap/files/patch-debootstrap b/sysutils/debootstrap/files/patch-debootstrap index dc2822ec82a9..b8b633661c06 100644 --- a/sysutils/debootstrap/files/patch-debootstrap +++ b/sysutils/debootstrap/files/patch-debootstrap @@ -30,7 +30,7 @@ HOST_ARCH=$(cat "$DEBOOTSTRAP_DIR/arch") fi 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 ;; esac @@ -38,6 +38,9 @@ + +if [ "$HOST_OS" = "freebsd" -a -z "$HOST_ARCH" ]; then + HOST_ARCH=`/sbin/sysctl -n hw.machine_arch` ++ if [ "$HOST_ARCH" = "aarch64" ]; then ++ HOST_ARCH=arm64 ++ fi + EXTRACTOR_OVERRIDE=ar fi