From nobody Thu Jul 20 01:32:37 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 4R5wD61xPXz4nVnR; Thu, 20 Jul 2023 01:32:38 +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 4R5wD61Bplz3n08; Thu, 20 Jul 2023 01:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689816758; 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=jNA7Nat+7Hug3ISASE3XAQVqgAQcDhwAtYVQ4rc2eVo=; b=LZ1kGPgW7ecqvlMXk7MZu3aiL6K7xZ3cqUs8A8BfjaYEPetLr4KGempe1zoV1kAI+ABDqS SeMfywVSBYxtCRPG2Su/cn33ojPbiUfvYMluS7RdtnxELZcuvYzujc4mgSbmX4pQDHQy5O T4v4bVT5PJGSSGYLiyGcSfskEtdLhf5YLYNZStRJwfObMDiic75Fl7Ik1YxRYEfWbXVq6u 8PO9YOe6XWLgCr/nESEaeaVYcQAQXn9EYuz7ohbzY2hEZolr6vcHEsH4esWgBreCbUXOH3 vf/d2uyb84jgGa4s1Mo0AOxUGrC+J8fHZscxYJqKJ51Uxw0V6X1vIv7L4BvjSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689816758; 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=jNA7Nat+7Hug3ISASE3XAQVqgAQcDhwAtYVQ4rc2eVo=; b=akpCWZsHYvuyVaTXcBzVbQb4YzzMtWf40/OjQWXgB1wNQ6dHlcsf96H74bY/oT1SP5i298 oiEkADNiuEkpUyfrxIzcfwxecnONJZnKXP68/zRWzyK+KIT8aJDEyBAoUTQ2RrLd4rHKha 0MRimIJztoICWNieXdAJImeazKKBrTTxZ1xbQvbalPo9Jqw1iGzZX7BTio7WGOpxl3PJHl yc5tCci7iZYV6rw1tvkFpWMC0FUy8j6oT/EB1Ju8oA39D+7TarhVZ6I6hsyN3BhMuECaQa NL1VCNQ9rSlxxWxHgWdZ/tz0DMOljwd5FB/XmfzoiXAm4U48kbndnfUfmwLpVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689816758; a=rsa-sha256; cv=none; b=j+8zn9PLIvg1+veGQfaATCO0aIBNRf7bx69bGuOLp/O6r+QQqJXnotGQjp7MK9x3jpcOM1 2ie6vSPqXxtr0DOWf4/kNM4muRetfpsuRaavGBU/FN8WwmVlVyCfWlnAXXxYtMGE0wj5jo JUgz93u0l1R+oNJZp3z6EYdCu5RkT+5RLiq37qKzttqwIgYMhqYY4J98jlltpBiaqmmnAp da5iJLp/9nXs2SbsfRrWPFTjAyz1/MFcso4GCjq43Nkb5V5JNlmupAlcancMFMgE+uBrxa P3X5FMNcFKQuDS69oNXUEta9Sczl4OFVZoFHokwOKuoJrk59m2ha++tEvQCsug== 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 4R5wD60Bs9z1BKH; Thu, 20 Jul 2023 01:32:38 +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 36K1WbNd028984; Thu, 20 Jul 2023 01:32:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36K1WbUD028983; Thu, 20 Jul 2023 01:32:37 GMT (envelope-from git) Date: Thu, 20 Jul 2023 01:32:37 GMT Message-Id: <202307200132.36K1WbUD028983@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: 3e94b6a23808 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3e94b6a238081a1178f2e6448cb9d91028784bf2 Auto-Submitted: auto-generated The branch stable/13 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=3e94b6a238081a1178f2e6448cb9d91028784bf2 commit 3e94b6a238081a1178f2e6448cb9d91028784bf2 Author: Glen Barber AuthorDate: 2023-07-17 20:16:46 +0000 Commit: Glen Barber CommitDate: 2023-07-20 01:31:52 +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 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