From nobody Mon Mar 23 16:41:17 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 4fff7k6Tfgz6WDqn for ; Mon, 23 Mar 2026 16:41:22 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fff7k4lMSz4Kgt for ; Mon, 23 Mar 2026 16:41:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774284082; 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=Qrx/j6/xEMHYF1i4x++R9V4VwMypXd7bCdfMcVbyvDs=; b=qu0YPjkSrmNa1mTTegOrG3EKdVRSbEakZERRM6vrUTEWh3gucakwy3HS/PlR+teZvn3PYU Luii/HBUZPyp65W+fM8rrK3jwKoM30MqE4hG/SBfo5Pg0ieexyo7QKERDw8yW2ywQ12W05 9FVWQlR4SNw3kl4ECqs3bZ469U72FvnBpCiB1+BOAlI4OUWR5O8xt4E8O4bbaibLAZxnyA rHTJmrwHewy92ZnhlBOLdYL8/vIcSpWCkQg60GcV+uRBzYgEfLkcHWCgluaKQEDQmlsXwZ zAUSyEpu794MTNU+p+t+HjNyTEqyKlZRIiL85wnpxd8KVuYdbWiPRt8LefKuYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774284082; a=rsa-sha256; cv=none; b=NnZGCCbWkQBoqwNjQ0iF5zFZ7iuYk+E4kLy1QwsaNgix83CDYj9S/H7wDDWDnuAfSvYl9M KdStxh89Ho8yEAtj0G1XbIFrIePrqh1YmYnSxPbPEoQdh5CHlSHO6Fne20Gv4gNv7dvXSr xCATM1BvlsWAraBf8Q80+Z9i3VbF9mPRtfsujCaJFK/3ZgEtZ6RHD8V7olGSd20C03p+To yld5gqgenT26DQgA7rzBJLCIvnEf6Yx537bfv+TjEounWOj7sRX2wTt4IvHr3zput1Jf5p rWk2bHLT8XaQJqUQZ822u22h6WQ340OElDSjSvHIFLUejQ8b6isM5FKXjdXOnQ== 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=1774284082; 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=Qrx/j6/xEMHYF1i4x++R9V4VwMypXd7bCdfMcVbyvDs=; b=p4NIrFEbp9pucSHlBxMv+06yiUVLI7RJ981WXlNqWv2D8C3puiWfvsqzNScHW4vcx/L2LE 0CksisgBI0HZiW+KQh+ohI0P1jDebNsoq+FaMGCc4rGaLEqAYwaaGxsJ6eu+ppl5M6BLhE r2jWsJ9Ge9/3jKsyZ+tjv1XXR5nBejJDpLgHn/tIiIrrJ/il8fcX5vi934ia3WOkj/Euqv h4ecGo7WcwAZVn8fUgrroJlpRKEznffsde11ZwvpcdcJ9D3XP7kGS2wTWDoS/E23LmWI2B id/srs/ZBMWZlQ1yPBwoTMpAKFDnMaICyL8ZQ2yZlWzQj3ngdnd5nRZ5HamD1Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fff7k3nwPzwmD for ; Mon, 23 Mar 2026 16:41:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32848 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 23 Mar 2026 16:41:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 61f0453b3aa7 - stable/15 - 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 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/15 X-Git-Reftype: branch X-Git-Commit: 61f0453b3aa71e640a42085f67ce556ca3283c6c Auto-Submitted: auto-generated Date: Mon, 23 Mar 2026 16:41:17 +0000 Message-Id: <69c16d2d.32848.5c02b834@gitrepo.freebsd.org> The branch stable/15 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=61f0453b3aa71e640a42085f67ce556ca3283c6c commit 61f0453b3aa71e640a42085f67ce556ca3283c6c Author: Ed Maste AuthorDate: 2025-12-26 16:36:43 +0000 Commit: Ed Maste CommitDate: 2026-03-23 16:40:35 +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) --- release/Makefile | 4 ++-- release/Makefile.vm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index 2469385408ee..c6112faff947 100644 --- a/release/Makefile +++ b/release/Makefile @@ -40,7 +40,7 @@ # TARGET/TARGET_ARCH: architecture of built release # -WORLDDIR?= ${.CURDIR}/.. +WORLDDIR?= ${.CURDIR:H} PORTSDIR?= /usr/ports .include "${WORLDDIR}/share/mk/bsd.compat.pre.mk" @@ -62,7 +62,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 142fd6e7bdf5..3e5f4936b518 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -73,7 +73,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