From nobody Mon Jul 17 20:16:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R4YJq02h5z4ng1v; Mon, 17 Jul 2023 20:16:59 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R4YJp6k7tz48wd; Mon, 17 Jul 2023 20:16:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689625018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LvB3E/xf9yxphlJKEPlKLp4fCxZIC2zGUVREXEFlzYU=; b=C6BHaDJMSMUXma9O1Be6K9Svyb1b9jrwwK1cFSKlev9OfIAOV1TUhpKU/vTp9uYfL0ZpEo YkZOCmnNCt96nGD+IUmDOemWQTtDEE9qSouLe9JXO6BAaPSEgnC4iM1VdPdEJGR7lOhm+z AGPgX5jJSTV1dbaSaOTdB9ZpkTEUqyLB9efQ11mszAJrt/+d1U6bgn60lS/wH0M7VKKXYs wLK9md7ZeUc2jFzS24znysy3e5knUJku+fuig95Y4+bgSY1XRFF9V4l8y2Tj+E+DDXEVsW dxxJPeafPowtZtt5HEgZ3DKA/NxpLvYrgY9HdDOLKY7oo/OU43adbrndocdt6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689625018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LvB3E/xf9yxphlJKEPlKLp4fCxZIC2zGUVREXEFlzYU=; b=a47k8+miqOtxGynI9PYQQ3hWagP8+Qg54vRULlk0TLaHkQkv/JCrPsKdj9J9EFKfFaUskF mvVVfHErwi4hjEYDL6eNjSw2wQu+q+RU5QrZWvP5r+1OnMD2+DFmttmuQOfGRsJof2DZYW I1/IaX0hKP48o9970Ow1wbmudX16z2LgbrnuSMUv95/nue+DCAvL2LoKvs3lxTabMX1qhu MI4gLRdJ6/FGpWcL6+lvuwA+sb15wGTLdFuc6v3JshdP2rGjwTuHTMEzaQNhGH8YrGaEbK rQ+q1jPSAK9zAJQQGW0JLzg7SOscRf1+eevWVywtfRiPmWUK66nF3d33w5gPgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689625018; a=rsa-sha256; cv=none; b=SNzgw3qfaBRwTahSJKmy2NJm0IAYKygpBo880BcbNQSn3DfZ1OYTfvN8UyrnOHTJ3tXu5u PodQ0fOImJUjvRwXyFNpziQnayZGosjnUzzCkgkFLFvmAURknPp5GeU9sot4V+mzsdO/Pc xoFevKWZYuI0rreYCsocK54JSQZVNlIHrVQgq7nQIaKY9PgB+/2b3XOVA6zzCUioR5+7Th b4Wwr+LAdNd+FUi/bMA5z5NbbB6L5QkiaNxtYlVWSsF4YxICAPrnp66BVOUCdvoouEQOte VCySPrFpNH4zgLVeGWyBTRxotzc26xjiZrcfUs3cjKeBPJVyUSmpIVFeKPGOFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R4YJp5k5Zzd1r; Mon, 17 Jul 2023 20:16:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36HKGwt9029822; Mon, 17 Jul 2023 20:16:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36HKGwqh029821; Mon, 17 Jul 2023 20:16:58 GMT (envelope-from git) Date: Mon, 17 Jul 2023 20:16:58 GMT Message-Id: <202307172016.36HKGwqh029821@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Glen Barber Subject: git: b24c35b326db - main - release: adjust lang/python* dependencies for GCE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b24c35b326dbd355070335e63d02e7c29ee58bf0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=b24c35b326dbd355070335e63d02e7c29ee58bf0 commit b24c35b326dbd355070335e63d02e7c29ee58bf0 Author: Glen Barber AuthorDate: 2023-07-17 20:16:46 +0000 Commit: Glen Barber CommitDate: 2023-07-17 20:16:46 +0000 release: adjust lang/python* dependencies for GCE The lang/python3 port had failed to properly install because it did in fact already exist and FORCE_PKG_REGISTER was not set. So, behaviorally everything here was correct. However, installing lang/python3 is in fact not correct and not needed, so only install the lang/python port to provide symbolic links. PR: 272354 MFC after: 3 days MFC with: 510fd83138001b0a6e45b3fa6a7249377f806171 MFC with: cd8cad0ef5cd534dc7ae1dd9a470cac2057ed957 MFC with: 0ed426276fd52e917506ab87c05a61c6641ae298 Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd --- release/Makefile.gce | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index ff364c9287c5..17f4974b1c53 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -46,13 +46,11 @@ gce-check-depends: . if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf . endif - env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk - env ASSUME_ALWAYS_YES=yes pkg install -y lang/python lang/python3 \ - net/google-cloud-sdk + env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk \ + lang/python . else env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python BATCH=1 all install clean - env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python3 BATCH=1 all install clean . endif .endif