Date: Thu, 16 Jan 2020 01:13:33 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r356770 - in stable: 11/release 12/release Message-ID: <202001160113.00G1DXRA008524@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Thu Jan 16 01:13:32 2020 New Revision: 356770 URL: https://svnweb.freebsd.org/changeset/base/356770 Log: MFC r356685, r356686: r356685: Ensure the TYPE, BRANCH, and REVISION variables are set in cloudware targets when OSRELEASE is overridden. [1] r356686: Fix a typo. PR: 243287 [1] Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: stable/12/release/Makefile stable/12/release/Makefile.vm Directory Properties: stable/12/ (props changed) Changes in other areas also in this revision: Modified: stable/11/release/Makefile stable/11/release/Makefile.vm Directory Properties: stable/11/ (props changed) Modified: stable/12/release/Makefile ============================================================================== --- stable/12/release/Makefile Thu Jan 16 00:26:53 2020 (r356769) +++ stable/12/release/Makefile Thu Jan 16 01:13:32 2020 (r356770) @@ -54,7 +54,7 @@ TARGET_ARCH= ${TARGET} IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} DISTDIR= dist -# Define OSRELEASE by using newvars.sh +# Define OSRELEASE by using newvers.sh .if !defined(OSRELEASE) || empty(OSRELEASE) .for _V in TYPE BRANCH REVISION ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V} Modified: stable/12/release/Makefile.vm ============================================================================== --- stable/12/release/Makefile.vm Thu Jan 16 00:26:53 2020 (r356769) +++ stable/12/release/Makefile.vm Thu Jan 16 01:13:32 2020 (r356770) @@ -39,6 +39,12 @@ VAGRANT-VMWARE_FORMAT= vmdk VAGRANT-VMWARE_DESC= Vagrant Image for VMWare VAGRANT-VMWARE_DISK= ${OSRELEASE}.vmware.${VAGRANT_FORMAT} +.for _V in TYPE BRANCH REVISION +. if !defined(${_V}) || empty(${_V}) +${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V} +. endif +.endfor + emulator-portinstall: .if ${TARGET_ARCH} != ${MACHINE_ARCH} .if ( ${TARGET_ARCH} != "i386" ) || ( ${MACHINE_ARCH} != "amd64" )
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001160113.00G1DXRA008524>