d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r348438.

Browse Source 
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
This commit is contained in:
gjb 2019-05-31 18:40:19 +00:00
parent e9b44e8630
commit 52dd8736d5
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/tools/gce.conf
View File

@ -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 \

4
release/tools/vmimage.subr
View File

@ -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
}