From nobody Fri Jun 13 01:21:44 2025 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 4bJM7F3wG3z5ykGv; Fri, 13 Jun 2025 01:21: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bJM7D375Kz3L0f; Fri, 13 Jun 2025 01:21:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749777704; 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=pLbimveUhImbfG8/ZTIk2a3rmpRpBhXiqBm4apcfmJQ=; b=rJOSJFmlkJn5A5F19cutkcUkmpFhhGZBxDN6y9G30ekbPnESkmzoOXPuXkdDnrK0vyt3bX E6ANnmn3Vaklf98QGD3m77lc6Tx55kTKg0t+hAq1L8pt56rxnrXnpw8EvDWtOUOFgsaC2M GNP22Cb9AI1Csk/0dfpYIejGLgUe9rk0KYnqJys0uDiaAlCP3TpsBN5p2Iahn/fY+569CT j9669yxCKqSMHGIQR2fufVON592h6+fS3eA7s+el+8q4kvmQ5ftep6Za05CtxKUi9+ZLA0 38GfZte1jdNEEV6jfthCgCwJ6NqOF969I5+ScIUsk/dhI9sY2Q7kJr+L8lZT4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749777704; 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=pLbimveUhImbfG8/ZTIk2a3rmpRpBhXiqBm4apcfmJQ=; b=jDEmgr6uzKo9FCCNczXrOsqotQznmvpNGIagH2/Y3fgx6HIBB7ue6XZIhro+X4LPKz15IH sO6zmjVQOdWuyXMWWRIOl6UO3uHbx3Ht82yTHnyYeDnVsw1YiXUtmOHI7dzuJ/ThAgoFk3 dd1gi5GoLgy/fgJU3zK9kktoPs85guC8MFLW5dtK7PyLDdpPSQ76sDOo116p5o+7Ew0CEP R/XYBTSKWsw50a5QCynMsGtEbjI2vuIjCb0moBj8ZeINaSc57dHrdVS6Dcft3MVtH7HHBf YYU38rYEkWYbFDhoDl5DdBq4ryhskD78U0xyCiOANxk6CqrIAL1qh4O2fg7IeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749777704; a=rsa-sha256; cv=none; b=HsLK/1Gfe3BO8UN0m7SIwA/92Tsiwr6zMl3i0mVoNEWRCWxVfCHEZrHiPNHPImRcjt6oFS ZlmdlpwNKCSNccPEEWBaHuhJ7etLLqw9neyNSLuXcTIc/XqN6itfaDrPehtZByIhU6h3pe 3fMg3igDVatoDB7oLUSmKvpkLcnn7FkIy77NIZM0Bf5eNypdbT7rX6ZCC6ptiRD7lfh5WM /SNf2SbGd0cPMsyGzeXe/oXMqvomlCV9l5dVvKYmZ+p+DwPu1nvOHqdvOKvdvaPCSu9sBi qM1W9b9W+jryuWmSP26G/09AoIpngVXxUoR/PjgjzrMaRL0KUdPrA+HmRHsTCg== 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 4bJM7D2l3Czd0f; Fri, 13 Jun 2025 01:21:44 +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 55D1Li1B086495; Fri, 13 Jun 2025 01:21:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55D1LiMA086493; Fri, 13 Jun 2025 01:21:44 GMT (envelope-from git) Date: Fri, 13 Jun 2025 01:21:44 GMT Message-Id: <202506130121.55D1LiMA086493@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 3601528f19c3 - main - Makefile.inc1: define PKG_VERSION_FROM only if $REPO/latest symlink exists 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3601528f19c30b633e3c5631b74e2bf79705aac9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3601528f19c30b633e3c5631b74e2bf79705aac9 commit 3601528f19c30b633e3c5631b74e2bf79705aac9 Author: Siva Mahadevan AuthorDate: 2024-10-04 22:03:27 +0000 Commit: Warner Losh CommitDate: 2025-06-13 01:21:44 +0000 Makefile.inc1: define PKG_VERSION_FROM only if $REPO/latest symlink exists Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1445 --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 42a5f5cfb0a9..e56c40c114fc 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2000,7 +2000,7 @@ PKG_EXT= pkg .endif .if !defined(PKG_VERSION_FROM) && make(real-update-packages) -.if exists(${PKG_ABI_FILE}) && exists(${REPODIR}/${PKG_ABI}) +.if exists(${PKG_ABI_FILE}) && exists(${REPODIR}/${PKG_ABI}/latest) PKG_VERSION_FROM!=/usr/bin/readlink ${REPODIR}/${PKG_ABI}/latest PKG_VERSION_FROM_DIR= ${REPODIR}/${PKG_ABI}/${PKG_VERSION_FROM} # Determine the name of the branch base on the version