svn commit: r325769 - in head/release: . arm

[Glen Barber]

Author: gjb
Date: Mon Nov 13 19:31:51 2017
New Revision: 325769
URL: https://svnweb.freebsd.org/changeset/base/325769

Log:
  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

Modified:
  head/release/Makefile.mirrors
  head/release/arm/GUMSTIX.conf
  head/release/release.sh

Modified: head/release/Makefile.mirrors
==============================================================================
--- head/release/Makefile.mirrors	Mon Nov 13 18:53:41 2017	(r325768)
+++ head/release/Makefile.mirrors	Mon Nov 13 19:31:51 2017	(r325769)
@@ -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

Modified: head/release/arm/GUMSTIX.conf
==============================================================================
--- head/release/arm/GUMSTIX.conf	Mon Nov 13 18:53:41 2017	(r325768)
+++ head/release/arm/GUMSTIX.conf	Mon Nov 13 19:31:51 2017	(r325769)
@@ -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"

Modified: head/release/release.sh
==============================================================================
--- head/release/release.sh	Mon Nov 13 18:53:41 2017	(r325768)
+++ head/release/release.sh	Mon Nov 13 19:31:51 2017	(r325769)
@@ -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"
 				;;
 			*)