From nobody Mon Jan 5 16:49:31 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 4dlKyh37b8z6MlC5 for ; Mon, 05 Jan 2026 16:49:32 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dlKyh0j3jz42gG for ; Mon, 05 Jan 2026 16:49:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767631772; 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=/nC4Mc2OyaWfU5c1X7Jj+VXtnppHo9mUOsjb0WhUV0A=; b=fc7rOdRIXKVN5E1F/0RIr9btXapXNb/QbzIBt/4js8V2+enHErzrdnu6mnTtxWFJ2FUYL+ LuV+M0vNMcZnXn1lA9G7VQHwoomb/uwwb6Xvqzx12t7ZezmCXDfRfDPSImS7ze1typP57A LFIiw3FzYjCs+lUVgZ9ge2wKlWb3f1gU5gcl0m3ZnBOTqgq9J7McwULijUyEHHsoRklqYG cjd/QrJ92OLblzurDeTK8RWfxDstiW1Az6hd6Gm1ocXgPmpxdcKh2sWW1WP3OpA1xLr7PZ bVZYz+355zl6POTyEZDgFHxCVRxyIJ7ITaJluudcHXsi/6pk5MyUyBNV6fbHGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767631772; 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=/nC4Mc2OyaWfU5c1X7Jj+VXtnppHo9mUOsjb0WhUV0A=; b=h77iIk6nvxiRmUrzNtqORzVuwageH3O3lh8urtY6fRM7UkyQVg/fKsJhsORaVoz5GVHvsv se5Jg1dOJYH1chDDaiut8j518Jp2boxau/U9kb6TubXWVB4JlwZYNCSJI/VcBxKrMwlQhy EVxhyRlJsvI5J4Kbe+uAO3U4lOZfgzXHQg3D+f/C473CeYXPebRH9Jn1mFaIwocOVK0RUE Cmrg6SXi4hhDYoZhkfpaYwA1TiIvucawxm3F8xsR1gOaM/A15YiYKaOfhU5t32FI88ueoY UIXmNbEZcE1r1jTHWzjqVRylANYufRtq6+yPspXU7n/O/qEljB4TNMA+rw63Bg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767631772; a=rsa-sha256; cv=none; b=J1BtoK3VwnqmMg8RHxEgvmZnhPNvzh3ix9Dgm8bi43qW2UVsbKYDhDTsLDCSB30DNZ8zMG h83ayTY6Ws9Ebj282WpdvXfCUNa9Y/26igxfaoACaopUXyG0XAhf59tsy7ERTW9x4Rlk3e T3jTI7WN4axLP0U1r3XAp9SLNy/MgzVchMUoaM1AnACm1VJsJBMo2YcEO2uWV45ZEMhhLf +lE0+Ucukwc3DfTa29r2/Ha1lCdKoCOGTC6v/ETbF3EWavk+22NwDDy9GoheuPzLzWfVCC UUKrjdEPHW73Dl2Hzf7ug5YplGs37ZT03/9OFQse7V3ZXKKVmPYcHlRU+NqW/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dlKyg6sx6zCmN for ; Mon, 05 Jan 2026 16:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 245a9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Jan 2026 16:49:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 3949c2b8c469 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 3949c2b8c4691a6dff8be7b38805d56faab91187 Auto-Submitted: auto-generated Date: Mon, 05 Jan 2026 16:49:31 +0000 Message-Id: <695beb9b.245a9.46da571c@gitrepo.freebsd.org> The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3949c2b8c4691a6dff8be7b38805d56faab91187 commit 3949c2b8c4691a6dff8be7b38805d56faab91187 Author: Ed Maste AuthorDate: 2025-12-26 16:36:43 +0000 Commit: Ed Maste CommitDate: 2026-01-05 16:49:04 +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 --- release/Makefile | 4 ++-- release/Makefile.vm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index fc91b31df579..230eb66fc077 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