aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2017-11-13 19:31:51 +0000
committerGlen Barber <gjb@FreeBSD.org>2017-11-13 19:31:51 +0000
commitd412b1d7bc87aec0536787a74d88f982cbc0e7ad (patch)
tree07d4566a77ee38b4aa9aac8eb2abec8358c85b5d /release
parentf362a3985c31790289393bf6d583c916bdb99de1 (diff)
downloadsrc-d412b1d7bc87aec0536787a74d88f982cbc0e7ad.tar.gz
src-d412b1d7bc87aec0536787a74d88f982cbc0e7ad.zip
Update the GUMSTIX image build to use arm/arm TARGET/TARGET_ARCH.
Update the TARGET/TARGET_ARCH matching in release/release.sh and release/Makefile.mirrors for simplification. Discussed with: mmel MFC after: 3 days Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=325769
Diffstat (limited to 'release')
-rw-r--r--release/Makefile.mirrors2
-rw-r--r--release/arm/GUMSTIX.conf2
-rwxr-xr-xrelease/release.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors
index 390aebfdb6c4..66635eff3346 100644
--- a/release/Makefile.mirrors
+++ b/release/Makefile.mirrors
@@ -57,7 +57,7 @@ TLD?= ${FTPDIR}/releases
.endif
.if defined(EMBEDDED) && !empty(EMBEDDED)
-. if ${TARGET:Marm*} != "" && (${TARGET_ARCH:Marmv[67]} != "" || ${TARGET_ARCH} == "aarch64")
+. if ${TARGET:Marm*} != "" && (${TARGET_ARCH:Marm*} != "" || ${TARGET_ARCH} == "aarch64")
. if !defined(BOARDNAME) && empty(BOARDNAME)
BOARDNAME:= ${KERNCONF}
. else
diff --git a/release/arm/GUMSTIX.conf b/release/arm/GUMSTIX.conf
index ab099d0b8a3b..2763c3bca7c0 100644
--- a/release/arm/GUMSTIX.conf
+++ b/release/arm/GUMSTIX.conf
@@ -5,7 +5,7 @@
EMBEDDEDBUILD=1
EMBEDDED_TARGET="arm"
-EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDED_TARGET_ARCH="arm"
EMBEDDEDPORTS="sysutils/u-boot-duovero"
KERNEL="GUMSTIX"
IMAGE_SIZE="3072M"
diff --git a/release/release.sh b/release/release.sh
index 18ec210b78f6..6a9a1fd7f2fe 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -148,7 +148,7 @@ env_check() {
WITH_COMPRESSED_IMAGES=
NODOC=yes
case ${EMBEDDED_TARGET}:${EMBEDDED_TARGET_ARCH} in
- arm:armv6|arm:armv7|arm64:aarch64)
+ arm:arm*|arm64:aarch64)
chroot_build_release_cmd="chroot_arm_build_release"
;;
*)