From nobody Sat Feb 01 03:35:17 2025 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 4YlJLG2C6tz5mXfW; Sat, 01 Feb 2025 03:35:18 +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 4YlJLF5Jbxz3V5m; Sat, 01 Feb 2025 03:35:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738380917; 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=TW+mnF2jUUmd/S9GH52Lp0Rfmujexy9LFBVKpKNBqUw=; b=Pxb2Ib41BwZIdc5bYYSbuF1Wia4VVgfJG424yOK6b/a+2AslgjkegMmwaJRZMSXH/1IfgM tUdCUpuXJT42GX1WPPhvWEoZR6e8NUVTi2tRsTfQDqi7Z3XeH1jW1xtBDkDqFl7ZqE1Fro 5S8+XNe9147oBdgKeBvz1Rw5fk7Po67Af6QerSjTeMypTLtS7k3ojNqMXX1U69WMMR/V4Z vSKTFLWHlVpem5kHIwNGbbtTXNCuaNC9vlhhk83hm0Mk4xtloWqxFrA97L9ziq4V2DrNIS sQxk3kxzNqtAIG+6aCaH0RmpgOkr7go/0Yw/94mTkkKJKccqLSjxzJKC+rrYZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738380917; 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=TW+mnF2jUUmd/S9GH52Lp0Rfmujexy9LFBVKpKNBqUw=; b=LbUxAqasysdkddNVn8++bXqpIzhNUT0zX2gPEII8EnDK1jTsDw/YKzDsLgIynYrpQyRb5K 9SUbPZ6rDwe6MSolmRUmsCao6u61Zy5M61tacDRiriJ3vKjcjzyZ0G72FPK55oP5u0INNa U0svLfQffpoNdT03T08/KQwparLwlEBK2ldDGCOAM3UdEgLXqL/0YEseamob3Xp3Pl6JtC CsiD37IBmLhcglwcUCj5LgaRV3XHw2vgE3U7eQlsAA00d8Zq8SzjwTAFA/sEkij7ybr3+I 7j+z5hJjTqMerdLN7nO6qykMN5I0sBqqmJ2A83t45bjZDSr6I9IjMcGfto/uCw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738380917; a=rsa-sha256; cv=none; b=CJwESqy9krI4uy+Nwqggao5GEntWBa1pY2LTwYdBkcUxCUMnpcVOLPnwYhfVa8X+rJ0tNd RlBd56BOfLJFaZdMi0cH6e2opZGrcEVbjfyZmrrJ6Dr8P5RXBAhooAAGQquYDuF2JJO7sT 9mPtRZ3iQfidNl9CDe8jMnrBJMLGPQG7V3Iyo9Kxl8n6/Mr6AFcbpbK4BhLTAVziTm+Kpr KMcBykL1DFnCz60zoWyGN3vhyW7WE22UsQnhBTsE5CwbGuejoMb0e8L1HSLsKpH07jTqQE FIEeCf2FTEtvTg34Z/FieDElYFRrvFyLk4cCLav/tPDe21CvEW69oz9lHOFyaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YlJLF4p3bznNN; Sat, 01 Feb 2025 03:35:17 +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 5113ZHnB032419; Sat, 1 Feb 2025 03:35:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5113ZHFO032416; Sat, 1 Feb 2025 03:35:17 GMT (envelope-from git) Date: Sat, 1 Feb 2025 03:35:17 GMT Message-Id: <202502010335.5113ZHFO032416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jose Luis Duran Subject: git: d9753f86679d - stable/13 - mtree: TESTSBASE directory always starts with a / 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d9753f86679d0659137b5ee38b1df31cf509f640 Auto-Submitted: auto-generated The branch stable/13 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=d9753f86679d0659137b5ee38b1df31cf509f640 commit d9753f86679d0659137b5ee38b1df31cf509f640 Author: Jose Luis Duran AuthorDate: 2025-01-24 23:10:05 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-01 03:33:22 +0000 mtree: TESTSBASE directory always starts with a / Remove the extra forward slash ("/"), otherwise the mtree specification file will have the double slash and will not be parsed by makefs when attempting to build NanoBSD with NO_ROOT privileges. Fixes: 07670b30fa43 ("Create /usr/tests *.debug file directory hierarchy") Reviewed by: emaste Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D47722 (cherry picked from commit 01ff67f4bdf5959a719a6511a855f6a60c0e3a93) --- Makefile.inc1 | 2 +- etc/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 65a5aa203aa3..d5c7eee442b0 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1450,7 +1450,7 @@ distributeworld installworld stageworld: _installcheck_world .PHONY -p ${DESTDIR}/${DISTDIR}/${dist}${TESTSBASE} >/dev/null .if ${MK_DEBUG_FILES} != "no" ${DESTDIR_MTREE} -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ - -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug/${TESTSBASE} >/dev/null + -p ${DESTDIR}/${DISTDIR}/${dist}/usr/lib/debug${TESTSBASE} >/dev/null .endif .endif .if defined(NO_ROOT) diff --git a/etc/Makefile b/etc/Makefile index 6d53b64a79eb..42d9e4763da0 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -108,7 +108,7 @@ MTREES+= mtree/BSD.libsoft.dist /usr/lib/debug/usr .endif .if ${MK_TESTS} != "no" MTREES+= mtree/BSD.tests.dist ${TESTSBASE} -MTREES+= mtree/BSD.tests.dist /usr/lib/debug/${TESTSBASE} +MTREES+= mtree/BSD.tests.dist /usr/lib/debug${TESTSBASE} .endif .if ${MK_SENDMAIL} != "no" MTREES+= mtree/BSD.sendmail.dist /