From owner-svn-src-all@freebsd.org Mon Nov 13 19:31:52 2017 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B31D0DC9226; Mon, 13 Nov 2017 19:31:52 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 809E179D69; Mon, 13 Nov 2017 19:31:52 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vADJVpZX097575; Mon, 13 Nov 2017 19:31:51 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vADJVpsw097572; Mon, 13 Nov 2017 19:31:51 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201711131931.vADJVpsw097572@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Mon, 13 Nov 2017 19:31:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325769 - in head/release: . arm X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: in head/release: . arm X-SVN-Commit-Revision: 325769 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Nov 2017 19:31:52 -0000 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" ;; *)