Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 28 Jun 2019 20:28:21 +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-11@freebsd.org
Subject:   svn commit: r349518 - in stable: 11/release 12/release
Message-ID:  <201906282028.x5SKSL8p095893@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gjb
Date: Fri Jun 28 20:28:20 2019
New Revision: 349518
URL: https://svnweb.freebsd.org/changeset/base/349518

Log:
  MFC r349372:
   Include files containing metadata specific to the branch in the
   directory where the individual distribution sets exist.
  
   The new metadata files include the build date, svn branch, and
   revision of the build.
  
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Modified:
  stable/11/release/Makefile.mirrors
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/release/Makefile.mirrors
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/release/Makefile.mirrors
==============================================================================
--- stable/11/release/Makefile.mirrors	Fri Jun 28 19:57:42 2019	(r349517)
+++ stable/11/release/Makefile.mirrors	Fri Jun 28 20:28:20 2019	(r349518)
@@ -19,6 +19,7 @@ FTPDIR?=		${RELEASEDIR}/ftp-stage
 .if exists(${RELEASEDIR})
 STAGE_TARGETS?=		iso-images-stage
 .endif
+SRCBRANCH!=		${SVN_CMD} info --show-item relative-url ${WORLDDIR}
 
 .if (defined(EMBEDDED_TARGET) && !empty(EMBEDDED_TARGET)) || (defined(EMBEDDEDBUILD) && !empty(EMBEDDEDBUILD))
 . if ${TARGET:Marm*} != "" || ${EMBEDDED_TARGET:Marm*} != ""
@@ -202,6 +203,9 @@ iso-images-stage:
 .if exists(${RELEASEDIR}/ftp)
 	mkdir -p ${FTP_DIR}
 	cp -p ${RELEASEDIR}/ftp/*.txz ${RELEASEDIR}/ftp/MANIFEST ${FTP_DIR}
+	echo ${BUILDDATE} > ${FTP_DIR}/BUILDDATE
+	echo ${SRCBRANCH} > ${FTP_DIR}/SRCBRANCH
+	echo r${SVNREVISION} > ${FTP_DIR}/REVISION
 	cd ${TLD}/${TARGET} && \
 		ln -s ${TARGET_ARCH}/${REVISION}-${BRANCH} \
 			${REVISION}-${BRANCH}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906282028.x5SKSL8p095893>