Date: Wed, 15 Feb 2017 16:43:26 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434184 - in head/ports-mgmt/poudriere-devel: . files Message-ID: <201702151643.v1FGhQx2030105@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Feb 15 16:43:26 2017 New Revision: 434184 URL: https://svnweb.freebsd.org/changeset/ports/434184 Log: Fix building arm64 jails by copying in the needed binutils. Added: head/ports-mgmt/poudriere-devel/files/patch-arm64-binutils (contents, props changed) Modified: head/ports-mgmt/poudriere-devel/Makefile Modified: head/ports-mgmt/poudriere-devel/Makefile ============================================================================== --- head/ports-mgmt/poudriere-devel/Makefile Wed Feb 15 16:42:49 2017 (r434183) +++ head/ports-mgmt/poudriere-devel/Makefile Wed Feb 15 16:43:26 2017 (r434184) @@ -2,7 +2,7 @@ PORTNAME= poudriere DISTVERSION= 3.1.99.20160624 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Added: head/ports-mgmt/poudriere-devel/files/patch-arm64-binutils ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/poudriere-devel/files/patch-arm64-binutils Wed Feb 15 16:43:26 2017 (r434184) @@ -0,0 +1,29 @@ +commit 58b0c214d76525e53745133cd3de56eda5379934 +Author: Bryan Drewery <bryan@shatow.net> +Date: Fri Aug 26 14:23:39 2016 -0700 + + For arm64 copy the latest aarch64-binutils ld into the jail at startup. + + This will work like the qemu installation done at startup, and not require + messing with the jail creation/update or snapshots. + +diff --git src/share/poudriere/common.sh src/share/poudriere/common.sh +index 4261243..8e0c8cf 100755 +--- src/share/poudriere/common.sh ++++ src/share/poudriere/common.sh +@@ -1795,6 +1795,15 @@ jail_start() { + mkdir -p "${tomnt}${EMULATOR%/*}" + cp -f "${EMULATOR}" "${tomnt}${EMULATOR}" + fi ++ # Handle special ARM64 needs ++ if [ "${arch#*.}" = "aarch64" ] && ! [ -f "${tomnt}/usr/bin/ld" ]; then ++ if [ -f /usr/local/aarch64-freebsd/bin/ld ]; then ++ cp -f /usr/local/aarch64-freebsd/bin/ld \ ++ "${tomnt}/usr/bin/ld" ++ else ++ err 1 "Arm64 requires aarch64-binutils to be installed." ++ fi ++ fi + + if [ -d "${CCACHE_DIR:-/nonexistent}" ]; then + cat >> "${tomnt}/etc/make.conf" <<-EOF
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702151643.v1FGhQx2030105>