From nobody Thu Jul 20 01:36:44 2023 X-Original-To: dev-commits-src-branches@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 4R5wJs4Vjhz4nX49; Thu, 20 Jul 2023 01:36:45 +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 4R5wJs0l9tz3pYm; Thu, 20 Jul 2023 01:36:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689817005; 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=kzbYQtJKxFmfBXOQcYmpEiG5cfbBR/LOifqW9W7UBeY=; b=mXTpC9Sfuz3gSjKFkO4q93r6wszBUoGxoLMh+7u03bEl0bhUvDwseY9VE2WxnvRBAr8Snt XSOo6zbeF7S0XAsKDV8PbG6jqljrfcggqLMx+UDjirT0MxFupqux75lBDRs/3t+ehNJqHM m/UjrWaiQOk5BRpNoMASXTAl9FPSwOO3jgkfDPIDYxoxXETjqIFQqd2ouSJM0IV0/2vxGJ QkBRPRYdvfYm1QO8v3cPPFOkSHGljJzQXUOyMHY7OfMeOyzAPxe2fNiLlDk0aaSIoRYdoW lM5rv/tkPAf8dEOVfEsGf3CGLXN43lM/oimMTyA7YK6fGhzrlHtb2hx5Ipa18A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689817005; 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=kzbYQtJKxFmfBXOQcYmpEiG5cfbBR/LOifqW9W7UBeY=; b=KAt1z2Lmqbr4XkifoijzQKeP45i12qTwH39KzTSuwHcdwl6CnHasbmBXBwBOEvPHqavLOp jOEe0a8tbjKt6eaw2R0urF2y6LLrp7cosM4aLrVJkMfv9+QlUmn0uTLzHN/ITfA9EyLRCs sn6oC5p1aOPPy3f6zAMCCyQvAZzFccOmcIuaUOfNUaWYxu+NxsDhNCxake19qkN7QwBIoY 3PahZyHIXVVjoiZaRO55GQ24CQCa5QEseIMAmPpD4FgIVSp9coPTe9hpmaVxw6YAWA4+Wn Sq8VmSMsHQR0Jt6Y0vOBNsMabZnrS3rVLiF502gj5hYKPvoPIq7sDQQqVk9Ujw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689817005; a=rsa-sha256; cv=none; b=o5vI34AKkzW99iP3Fk38FqEPD+i1k5TxKdBFBcQuniTcHhDiP0gqIr/LUEfnjdVJJ+q1B5 x5yj3WY2l6WDZVITMWN7PZKvdaJFcLQBPLRAoCOQ3WCVF9ym224EWa2W60FovCKMRnaJzD A1TuaPiZSur2KZ8wrImMjLcKxFAqHvjE+BwaA+JgJIonaFgp9oEV3PeBMULXXP2NYp5yg/ EzsZj76v6wYXhrtbjrt+GHu0CHS+kTCOW4rMUA3cZO8Wq7T+yJ0NVdhHtJFR226rI06vau mDihBp6yynjWuuhSmcDrSf2jaXR116NRPGI4hxOx6yCIkAmRcCWj73QMyJ9WBg== 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 4R5wJr6PGFz1BVd; Thu, 20 Jul 2023 01:36:44 +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 36K1ai7U029779; Thu, 20 Jul 2023 01:36:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36K1aiN9029778; Thu, 20 Jul 2023 01:36:44 GMT (envelope-from git) Date: Thu, 20 Jul 2023 01:36:44 GMT Message-Id: <202307200136.36K1aiN9029778@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: 58bc084de5a2 - stable/12 - release: adjust lang/python* dependencies for GCE List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/12 X-Git-Reftype: branch X-Git-Commit: 58bc084de5a2155f34ffbd5fd3812fb432e1a72e Auto-Submitted: auto-generated The branch stable/12 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=58bc084de5a2155f34ffbd5fd3812fb432e1a72e commit 58bc084de5a2155f34ffbd5fd3812fb432e1a72e Author: Glen Barber AuthorDate: 2023-07-17 20:16:46 +0000 Commit: Glen Barber CommitDate: 2023-07-20 01:36:06 +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 Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd (cherry picked from commit b24c35b326dbd355070335e63d02e7c29ee58bf0) --- release/Makefile.gce | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/release/Makefile.gce b/release/Makefile.gce index 2eb6c8f46c29..4a574e6e26ac 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -47,13 +47,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