From owner-svn-src-head@freebsd.org Thu Aug 2 18:51:45 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D6C6104A53C; Thu, 2 Aug 2018 18:51:45 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B893875EF0; Thu, 2 Aug 2018 18:51:44 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 99E8B15A98; Thu, 2 Aug 2018 18:51:44 +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 w72Ipi5K071237; Thu, 2 Aug 2018 18:51:44 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w72IpiB7071236; Thu, 2 Aug 2018 18:51:44 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201808021851.w72IpiB7071236@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Thu, 2 Aug 2018 18:51:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r337159 - head/release X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/release X-SVN-Commit-Revision: 337159 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Aug 2018 18:51:45 -0000 Author: gjb Date: Thu Aug 2 18:51:44 2018 New Revision: 337159 URL: https://svnweb.freebsd.org/changeset/base/337159 Log: Fix the ftp-stage target for arm embedded builds. The images were renamed from KERNCONF to BOARDNAME when specified, which would result in an image name of: 12.0-CURRENT-arm-armv7-GENERIC.img which would then be renamed to use the BOARDNAME for the SoC the image is targeted to use. BOARDNAME was specified for all images as of r336994, which now causes the ftp-stage target to fail, as the rename is no longer necessary. Sponsored by: The FreeBSD Foundation Modified: head/release/Makefile.mirrors Modified: head/release/Makefile.mirrors ============================================================================== --- head/release/Makefile.mirrors Thu Aug 2 18:37:02 2018 (r337158) +++ head/release/Makefile.mirrors Thu Aug 2 18:51:44 2018 (r337159) @@ -58,11 +58,6 @@ TLD?= ${FTPDIR}/releases .if defined(EMBEDDED) && !empty(EMBEDDED) . if ${TARGET:Marm*} != "" && (${TARGET_ARCH:Marm*} != "" || ${TARGET_ARCH} == "aarch64") -. if !defined(BOARDNAME) && empty(BOARDNAME) -BOARDNAME:= ${KERNCONF} -. else -OLDNAME:= ${KERNCONF} -. endif . if ${BRANCH} == "STABLE" || ${BRANCH} == "CURRENT" || ${BRANCH} == "PRERELEASE" || ${BRANCH:MALPHA*} != "" SNAPSHOT= 1 . endif @@ -91,13 +86,7 @@ iso-images-stage: cd ${RELEASEDIR} && rm -f CHECKSUM.* . for IMAGE in ${IMAGES} . if defined(EMBEDDED) && !empty(EMBEDDED) -. if defined(OLDNAME) && !empty(OLDNAME) - @# arm/armv6 IMX6 -> WANDBOARD, for example. cd ${RELEASEDIR} && \ - mv ${OSRELEASE}-${OLDNAME}.${IMAGE}.xz \ - ${OSRELEASE}-${BOARDNAME}.${IMAGE}.xz -. endif - cd ${RELEASEDIR} && \ mv ${OSRELEASE}-${BOARDNAME}.${IMAGE}.xz \ ${OSRELEASE}-${BOARDNAME}-${SNAP_SUFFIX}.${IMAGE}.xz cp -p ${RELEASEDIR}/${OSRELEASE}-${BOARDNAME}-${SNAP_SUFFIX}.${IMAGE}.xz \ @@ -150,12 +139,6 @@ iso-images-stage: .else # not snapshot . for IMAGE in ${IMAGES} . if defined(EMBEDDED) && !empty(EMBEDDED) -. if defined(OLDNAME) && !empty(OLDNAME) - @# arm/armv6 IMX6 -> WANDBOARD, for example. - cd ${RELEASEDIR} && \ - mv ${OSRELEASE}-${OLDNAME}.${IMAGE}.xz \ - ${OSRELEASE}-${BOARDNAME}.${IMAGE}.xz -. endif cp -p ${RELEASEDIR}/${OSRELEASE}-${BOARDNAME}.${IMAGE}.xz \ ${ISO_DIR}/${OSRELEASE}-${BOARDNAME}.${IMAGE}.xz cd ${TLD}/ISO-IMAGES/${REVISION} && \