aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile.mirrors
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2018-08-02 18:51:44 +0000
committerGlen Barber <gjb@FreeBSD.org>2018-08-02 18:51:44 +0000
commit768a8d8d44384643ca66fe7040ad4abaf8f31538 (patch)
treedf9108eabb9b74432f2022539bba3154f17ded62 /release/Makefile.mirrors
parentb7e25196eac4032f1cb65087f9da1ce7cabfb216 (diff)
downloadsrc-768a8d8d44384643ca66fe7040ad4abaf8f31538.tar.gz
src-768a8d8d44384643ca66fe7040ad4abaf8f31538.zip
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
Notes
Notes: svn path=/head/; revision=337159
Diffstat (limited to 'release/Makefile.mirrors')
-rw-r--r--release/Makefile.mirrors17
1 files changed, 0 insertions, 17 deletions
diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors
index 66635eff3346..44589d698c3c 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} && \