From nobody Thu Dec 26 10:47:08 2024 X-Original-To: dev-commits-ports-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 4YJlgd26Hlz5hgt7; Thu, 26 Dec 2024 10:47:09 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YJlgc6RQRz477C; Thu, 26 Dec 2024 10:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735210028; 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=JQVTiv2V5QfqTH3G++Abf6Act/9Qg73tp+EkHe331lI=; b=LCsY8R7wPz4j/M07oIWu4ebgn5CF/eO1A/KuujBBP/0eiKerkfaaO3QuKnABpiXI4E9eDK 2FZEMGEr8bBRFb0CyeuTVln8YQH7ppvg35Ma6NKWKztKBbBvZul8fUWl3TCsnh5J7tnpN9 wEtDNzu1tGVfsZHHPwY227XtYqX9efTOPl/o/jrRQE39e06xkIFTPYuXyj2CD+UHx/qBl8 TAb/7QK79v8zRL1Yl9ITLULCNpPIH3m072vF7w18pQRxEydtun8FgETjVD2MGh+Spe/TbK +LdAbbqclsCWeP1vbtsEhOcVKc857y3V7No5+DSOLo/C7yRPsaFb9oX3FMvrtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735210028; 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=JQVTiv2V5QfqTH3G++Abf6Act/9Qg73tp+EkHe331lI=; b=LIGw7cs25jvMo0fq8Mk2N63quT666jVYemSp0LPknvG9gg42g8Bk7YMHRL6HHxTcBacx3A THtf/ut2FLvxERhYzfEbDk61PKgbK/D0y/VpDYqKIaZKVlG1xcW+1n3QUvD0nQ7V7PDNuR Dg1z1dLVZ4z6cXx+N2uC5X8K2ldmnOtQxL2hHiGJrm62Qly8kxKW4bghO2xPYkYC3ydZGl N/SYL0enqEkX3c+Tw03Fv1lWN4/6hNjqG12vT/oNMfPyMZPsaxpGkevWz/0zmPaKMI6vmg UMAwA0vpOtUPSIHdsalYkQj9UJ+eLfaslonAt1B7eTIcthWikle9iDUsBYgWBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735210028; a=rsa-sha256; cv=none; b=jZeqkgRogBw8IwvJjv9tQRK78Zwr8kRDVv/JXe4XM0uPHGY6SMk3HJHX0KtRiu7vCe7kL2 KtxsVYpdrajwTTM8uGclvSbnMGP+eBNjsb9XL/9pujkh5nAcs6ecs9oIPn8pCFm4jqwROP Yc6wnD3FQ9mq93EFk8ujKCiYRRIolIRX42qh0wyIpKrPQ5dasnA7RvJ1dOSltEi8CZnQgD lpO9u+lhNwQGLGY19TrmbPOYVBWUQGqQqTDzcc9QzaYqUsxwDvW7bTvM1CNj74I5AMeGNZ BpM9JoWpvPWkqE2nIae0Qak1px/yHMMoUERFizbxOEwHdZKP7vg3NbIJnvpZww== 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 4YJlgc5vZ3zqyF; Thu, 26 Dec 2024 10:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BQAl8tc039443; Thu, 26 Dec 2024 10:47:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BQAl84E039441; Thu, 26 Dec 2024 10:47:08 GMT (envelope-from git) Date: Thu, 26 Dec 2024 10:47:08 GMT Message-Id: <202412261047.4BQAl84E039441@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: deb79782a9b8 - main - Mk/bsd.port.mk: stop ports from finding the ports tree's git repository List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: deb79782a9b87c64d06441e4bf67e46bf19c45c3 Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=deb79782a9b87c64d06441e4bf67e46bf19c45c3 commit deb79782a9b87c64d06441e4bf67e46bf19c45c3 Author: Robert Clausecker AuthorDate: 2024-11-30 13:35:18 +0000 Commit: Robert Clausecker CommitDate: 2024-12-26 10:46:28 +0000 Mk/bsd.port.mk: stop ports from finding the ports tree's git repository When building from source, the ports tree is by default a parent directory of WRKDIR. When ports try to use git to find the git commit they are built from, they'll some times find the port's git repository and produce bogus metadata. Set GIT_CEILING_DIRS in WRK_ENV to ensure that git does not escape WRK_ENV trying to look for a git repository that doesn't exist. This doesn't affect Poudriere builds as for these, WRKDIR is by default not a subdirectory of the ports tree, and neither is git installed in builder jails unless explicitly needed. As a result, bugs of this kind tend to go unnoticed by maintainers, but do affect source builders. Approved by: portmgr (mat) Exp-run by: antoine PR: 283098 Differential Revision: https://reviews.freebsd.org/D47850 --- Mk/bsd.port.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 01dc08c265f5..d6a6cd4c7e25 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1615,9 +1615,12 @@ PKG_NOTES+= flavor PKG_NOTE_flavor= ${FLAVOR} . endif +# GIT_CEILING_DIRECTORIES prevents ports that try to find their version +# using git from finding the ports tree's git repository. WRK_ENV+= HOME=${WRKDIR} \ MACHINE_ARCH=${MACHINE_ARCH} \ PWD="$${PWD}" \ + GIT_CEILING_DIRECTORIES=${WRKDIR} \ __MAKE_CONF=${NONEXISTENT} . for e in OSVERSION PATH TERM TMPDIR \ UNAME_b UNAME_i UNAME_K UNAME_m UNAME_n \