From e05592dd38c8561e94e4da8f06618617d60d9d48 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 2 Aug 2018 18:51:44 +0000
Subject: [PATCH] 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
---
 release/Makefile.mirrors | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors
index 66635eff334..44589d698c3 100644
--- a/release/Makefile.mirrors
+++ b/release/Makefile.mirrors
@@ -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,12 +86,6 @@ 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
@@ -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} && \
-- 
2.45.0