Date: Thu, 2 Aug 2018 18:51:44 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r337159 - head/release Message-ID: <201808021851.w72IpiB7071236@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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} && \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808021851.w72IpiB7071236>