svn commit: r434183 - in head/ports-mgmt/poudriere: . files
Bryan Drewery
bdrewery at FreeBSD.org
Wed Feb 15 16:42:51 UTC 2017
Author: bdrewery
Date: Wed Feb 15 16:42:49 2017
New Revision: 434183
URL: https://svnweb.freebsd.org/changeset/ports/434183
Log:
Fix building arm64 jails by copying in the needed binutils.
Added:
head/ports-mgmt/poudriere/files/patch-arm64-binutils (contents, props changed)
Modified:
head/ports-mgmt/poudriere/Makefile
Modified: head/ports-mgmt/poudriere/Makefile
==============================================================================
--- head/ports-mgmt/poudriere/Makefile Wed Feb 15 16:02:20 2017 (r434182)
+++ head/ports-mgmt/poudriere/Makefile Wed Feb 15 16:42:49 2017 (r434183)
@@ -2,7 +2,7 @@
PORTNAME= poudriere
DISTVERSION= 3.1.14
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= ports-mgmt
MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \
http://mirror.shatow.net/freebsd/${PORTNAME}/ \
Added: head/ports-mgmt/poudriere/files/patch-arm64-binutils
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/ports-mgmt/poudriere/files/patch-arm64-binutils Wed Feb 15 16:42:49 2017 (r434183)
@@ -0,0 +1,29 @@
+commit f61894880dc863258d8ef76fb1bde993b6b9ca08
+Author: Bryan Drewery <bryan at 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 7c1a4d7..4244b0f 100755
+--- src/share/poudriere/common.sh
++++ src/share/poudriere/common.sh
+@@ -1777,6 +1777,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
More information about the svn-ports-all
mailing list