svn commit: r333326 - stable/11/release/tools

[Glen Barber]

Author: gjb
Date: Mon May  7 16:21:53 2018
New Revision: 333326
URL: https://svnweb.freebsd.org/changeset/base/333326

Log:
  MFC r333262, r333264:
  
   r333262:
    Ensure the ports and src trees are available on GCE images,
    satisfying a requirement to allow FreeBSD to be considered
    a top-tier supported OS in Google Compute Engine.
  
   r333264:
    Fix a typo.
  
  Approved by:	re (kib)
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/11/release/tools/gce.conf
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/release/tools/gce.conf
==============================================================================
--- stable/11/release/tools/gce.conf	Mon May  7 15:24:03 2018	(r333325)
+++ stable/11/release/tools/gce.conf	Mon May  7 16:21:53 2018	(r333326)
@@ -85,6 +85,29 @@ debug.trace_on_panic=1
 debug.debugger_on_panic=0
 EOF
 
+	# To meet GCE marketplace requirements, extract the src.txz and
+	# ports.txz distributions to the target virtual machine disk image
+	# and fetch the sources for the third-party software installed on
+	# the image.
+	if [ ! -c "${DESTDIR}/dev/null" ]; then
+		mkdir -p ${DESTDIR}/dev
+		mount -t devfs devfs ${DESTDIR}/dev
+	fi
+	if [ -e "${DESTDIR}/../ftp/src.txz" ]; then
+		tar fxJ ${DESTDIR}/../ftp/src.txz -C ${DESTDIR}
+	fi
+	if [ -e "${DESTDIR}/../ftp/ports.txz" ]; then
+		tar fxJ ${DESTDIR}/../ftp/ports.txz -C ${DESTDIR}
+		_INSTALLED_PACKAGES=$(chroot ${DESTDIR} pkg info -o -q -a)
+		for PACKAGE in ${_INSTALLED_PACKAGES}; do
+			chroot ${DESTDIR} \
+				make -C /usr/ports/${PACKAGE} fetch
+		done
+	fi
+	if [ -c "${DESTDIR}/dev/null" ]; then
+		umount_loop ${DESTDIR}/dev
+	fi
+
 	## XXX: Verify this is needed.  I do not see this requirement
 	## in the docs, and it impairs the ability to boot-test a copy
 	## of the image prior to packaging for upload to GCE.