svn commit: r348474 - head/release/tools

[Glen Barber]

Author: gjb
Date: Fri May 31 18:40:19 2019
New Revision: 348474
URL: https://svnweb.freebsd.org/changeset/base/348474

Log:
  Revert r348438.
  
  The fix to override the default python version when building
  the sysutils/py-google-compute-engine did not work, and there
  are still issues that need to be addressed in the port itself.
  
  See bugzilla 238267 for additional details.
  
  MFC after:	6 days
  MFC with:	r348438
  MFC note:	no-op to appease the merge tracker
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/tools/gce.conf
  head/release/tools/vmimage.subr

Modified: head/release/tools/gce.conf
==============================================================================
--- head/release/tools/gce.conf	Fri May 31 18:29:12 2019	(r348473)
+++ head/release/tools/gce.conf	Fri May 31 18:40:19 2019	(r348474)
@@ -6,14 +6,10 @@
 # The default of 3GB is too small for GCE, so override the size here.
 export VMSIZE=20G
 
-# The sysutils/py-google-compute-engine port needs the lang/python
-# symbolic link to point to lang/python2.
-export DEFAULT_VERSIONS="python=2.7"
-
 # Set to a list of packages to install.
 export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \
 	google-cloud-sdk panicmail sudo sysutils/py-google-compute-engine \
-	lang/python lang/python2"
+	lang/python lang/python2 lang/python3"
 
 # Set to a list of third-party software to enable in rc.conf(5).
 export VM_RC_LIST="ntpd sshd growfs \

Modified: head/release/tools/vmimage.subr
==============================================================================
--- head/release/tools/vmimage.subr	Fri May 31 18:29:12 2019	(r348473)
+++ head/release/tools/vmimage.subr	Fri May 31 18:40:19 2019	(r348474)
@@ -72,10 +72,6 @@ cleanup() {
 		mdconfig -d -u ${mddev}
 	fi
 
-	# Avoid inheriting the DEFAULT_VERSIONS for lang/python from
-	# the gce.conf.
-	unset DEFAULT_VERSIONS
-
 	return 0
 }