From owner-svn-src-head@freebsd.org Fri May 31 18:40:21 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C469115C34B2; Fri, 31 May 2019 18:40:20 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 66F2C77CFF; Fri, 31 May 2019 18:40:20 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 448F144F1; Fri, 31 May 2019 18:40:20 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4VIeKnS092817; Fri, 31 May 2019 18:40:20 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4VIeJj7092816; Fri, 31 May 2019 18:40:19 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201905311840.x4VIeJj7092816@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 31 May 2019 18:40:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r348474 - head/release/tools X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/release/tools X-SVN-Commit-Revision: 348474 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 66F2C77CFF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.96)[-0.962,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 31 May 2019 18:40:21 -0000 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 }