From nobody Mon Mar 23 16:41:17 2026 X-Original-To: dev-commits-src-branches@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 4fff7d4Gn7z6WDnN for ; Mon, 23 Mar 2026 16:41:17 +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 4fff7d33Tqz4KQB for ; Mon, 23 Mar 2026 16:41:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774284077; 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=T+UC4qHdOursAQaMaZPbyGqYB1xs9tWVsvCGc376XLE6N33LFUc9vxmhy1oKpME+5R9vyn XSn6LzSPWQg7Gx4NGNuMacWJ32+vF7sNVUueSmrnap5SlcT0mLoPeFTbXqyoIiLlYRjz9n 6ZhO+SLIR2nencR5niT636qdhWEjF369gEGkn0iMchGQF+PqCj3ejYkH5MrrRfgu99Xzh5 L2XApmV+4MYZ1W2NdNbOe4F/QURp38V7uRDL9WVGZO4+cHPcMHNRoaimeE6zEbWQ+CpXpg z5H8Fed2h0k3hcjWcER2x661bFFlHrD+8Z0OalTPvWqmMsKZO4q+Kh3RdTJ15A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774284077; a=rsa-sha256; cv=none; b=DcxBmDYzkkfyADhZiyMSC//HZDPhS3aZAInxIAf2RNcbOXVKvHIvJdJUkqhCwcIHa0qkGD lg+mSjFZliuIzbus9glIzglFQLabN3tzN3lRMLsWGCBLnclexFJ9hPqH5zouVzv85hRa7b 2bfCF04wp3NR6zWZpzP0wPRwR7t1EiQvbfJ2I/VBOv4G1SrabN/DXSnn7aD3I8L3bJvTbB lofKnPMugFwFyRZHRhQSu29xeJKz5Tej21PcsDpr9rBD0to3XnphghIU8qGYxJPtFedV8z PMefRjpS1Xmb2/+dbM1HK8hhu15Cjj1j0ZtquvCt6QXSDefNJPj5xC1i/gqx5A== 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=1774284077; 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=uSzApxceONvFrGvYiankzubHyDJeVNewTuA1JWzI0oagN21bPuciDD/hhSmmhzHSmFBL7O 0MTQPVd9JyBjlT2rq1US/hSJW1QZzvPgmm0iDu4PrvJExcF5IyubYdQ446Kpma+p7IeCQW tdyO6kAmy2UomWWNYnKqDqsgi8HX/6nmzC3c/M0tlSi0uL1HZJCFi5bCXVUV/wABBUOEIM fbScAvizdJHHW/HE+9ZcH2blqEah9g6BuJUXuSUhJKKfysANk3682BjY/DoHbtFS/a282Z 447eu9z2/Jc7oY0DHCG5dpLw5lnoW4Tvka1ofpR0O/MRcdwVQQcOsSKPOZBK6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fff7d2f0Wzwm9 for ; Mon, 23 Mar 2026 16:41:17 +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: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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