From nobody Wed May 13 14:20:44 2026 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 4gFwbx1rYQz6dT0g for ; Wed, 13 May 2026 14:20: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gFwbw75nzz3RmW for ; Wed, 13 May 2026 14:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778682045; 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=2WEQCZE9xKVet05xT/V2FP9v5nxjg7TH2bH3aNVEZns=; b=AToHs3N6FcgglYW/wY7YkuCHJUS1UGlDgZSoPO/5VyV2owa3uJBG14pDUL/Uzrb5Aa6MXh sE1ezffEgE2s2WelGbwVqzQ9E4+23ydosk3Wj4meKGm0gD29A1ZLdCv2yX25PaE2yrH5JN fRFv77ZsdiyBqtCaZS5vIupEly5NFneq767X+nXKXa7Gs4mNTWqoYqvSYolDn3oEamRIgK HGT2701K9Hi3AGMaAM3w3Unq9dfdBA2dnGgC+cBSrflgYMKT9249VcFDOg3ATa5ZqyV+x7 0OKAKKKohVS/f4s944vCYvOWKkWRYAdHn1ftU5KCz4wTnGGh0y5ZJa/pG3juRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778682045; a=rsa-sha256; cv=none; b=xwCopLEb/lzCm8XxqSCqKCe91Uo5heEdH04byp9BuhKwRixZbglhpHg7J4uWEgEYtMGQp0 eyuyB2KXV9l27hVYoQbKa4HULq17HQg7EhGutlGTTQSz5Qyzb+rer1YVmH6aMg90gr9xP+ KJGY0GhIH6sxeTvuhbckBzi5CjMwPWyQDW2TY7OBudZ30tsMHqCtvM8TXrDYl0zpEKyNFi NvJL2jhi3p8F984m55tPlJSnIyR0jvE9kgsNxgYAzIew8+pvevS6QtxxtWeZjaG7laG6yJ soMLBNp7ltaKklYFjNnDKoqBTizQruENat4/Eysff2FqBlm/pzA7qYBZX8mK5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778682045; 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=2WEQCZE9xKVet05xT/V2FP9v5nxjg7TH2bH3aNVEZns=; b=ppeuGgoSyyXOsSRcXGB/gGxj5YJ7XZIqndmTSiPhfyqvwC/AB0UItrDzADSYHnTRJvD08q tjN0urMTS3wM6Qy6iOY22XnGKgNF6a7sssn27J9rtyquYh3PSd/ZlR4Z6K/GZBZax8bYz4 /bdAr+RfaAR65YkzMnDrkiaZ9oHt2f6QZkHiPvAx48wUgqKjuYqhu43wKW6FUa5Pe1RiJf WETPY7JMeIGX8tBB9tyUf1LhIb7P09Og5EZMsX7BWbEE+rtCMUwmeP8Ci+RxuGTM8Qyt17 LiteIx+LpJ6ueNzacoSS2P5EOcGMrmQXf+zvzAvcKFNeaQQ4K6la5kyKCdQncA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gFwbw6bhSzv9n for ; Wed, 13 May 2026 14:20:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26969 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 13 May 2026 14:20:44 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: cc921088d9ee - stable/14 - release: Use make's `:H` rather than `/..` 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cc921088d9ee9ec0ba79893fdeaf271f2955a1bb Auto-Submitted: auto-generated Date: Wed, 13 May 2026 14:20:44 +0000 Message-Id: <6a0488bc.26969.6504c2dd@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=cc921088d9ee9ec0ba79893fdeaf271f2955a1bb commit cc921088d9ee9ec0ba79893fdeaf271f2955a1bb Author: Ed Maste AuthorDate: 2025-12-26 16:36:43 +0000 Commit: Ed Maste CommitDate: 2026-05-13 14:20:27 +0000 release: Use make's `:H` rather than `/..` In general we want to strip subdir components, rather than appending `..`s. Reviewed by: lwhsu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54373 (cherry picked from commit 3949c2b8c4691a6dff8be7b38805d56faab91187) (cherry picked from commit 61f0453b3aa71e640a42085f67ce556ca3283c6c) --- release/Makefile | 4 ++-- release/Makefile.vm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index d71449fa78bc..7dbded45e2e6 100644 --- a/release/Makefile +++ b/release/Makefile @@ -36,7 +36,7 @@ # TARGET/TARGET_ARCH: architecture of built release # -WORLDDIR?= ${.CURDIR}/.. +WORLDDIR?= ${.CURDIR:H} PORTSDIR?= /usr/ports .include "${WORLDDIR}/share/mk/bsd.compat.pre.mk" @@ -57,7 +57,7 @@ DISTDIR= dist # Define OSRELEASE by using newvers.sh .if !defined(OSRELEASE) || empty(OSRELEASE) .for _V in TYPE BRANCH REVISION -${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V} +${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR:H}/sys/conf/newvers.sh); echo $$${_V} .endfor .for _V in ${TARGET_ARCH} .if !empty(TARGET:M${_V}) diff --git a/release/Makefile.vm b/release/Makefile.vm index e0e69deaaf28..3533fe4b797f 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -71,7 +71,7 @@ CLOUDWARE?= ${CLOUDWARE_GEN} .for _V in TYPE BRANCH REVISION . if !defined(${_V}) || empty(${_V}) -${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo $$${_V} +${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR:H}/sys/conf/newvers.sh); echo $$${_V} . endif .endfor