From nobody Sat Feb 1 03:35:01 2025 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 4YlJKx5STRz5mXgh; Sat, 01 Feb 2025 03:35:01 +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 4YlJKx4mr4z3V6p; Sat, 01 Feb 2025 03:35:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738380901; 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=LVg6FHmYHC/zrdm/o/u2gk6n/JDSDf03sxjsR0IiGoc=; b=Vbh82iK19rgp9fGb3C0BlkX3zgTV93Fr5t5TwX94/gCxRAcB8yZbTFr4M2P+L/FGqE/zTi Mhvi2G2UDwI4ez1wySeC+vcE8jdLnJAgckNrd8cuPVDA9veYqYrJMhyMAJuWo2PwWo6YKg DCYk2EdTIz62txL1jBPFFxrW3/v2Xj6Z3pHwM+EOI7DSYgo/Mb3DjrxsUDHvsjyvV3/3zZ pPnA4riuNIliLaGGXkbtX1UvZN46+++iCzaqpud4BvIC9IKfl20764/ITrBleIXls89Oy2 E3mbA64Dn+YafoSeTP/CMws4KxTEgJXqA8HB13Sqg1IHdsYJjI1w0dkGpFJxGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738380901; 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=LVg6FHmYHC/zrdm/o/u2gk6n/JDSDf03sxjsR0IiGoc=; b=wH2YCSLQBowaawIvshlcUrHsMJq45xcnVkQ+M0FXcXZcRQe9CSmsOhDXfWPqF5K5UEkbE1 h/pIAddb8k9ZBHj5MHx+B3T0ANZh2JlUuvi0S2Y4tLhMy/ynG5MG6C64dY2POL++DmNBlu i5+VyiYWtPAt6FReIArqG47AOCEHIqiT3iyOXOHYyK3qp0ovSR5avmLZINjD+zRYbN4pZZ YSHeC+/ouTcEdDDIP0lZ71mKyQbDNtmmfTGHHniLldEoOnKsKVl1LsyILa5+QlDUevbgo3 pd+GVYaa3BLSP618kbEFVYm25p0uTC25vQBhiglRsQ6zQjUSM6c+vhD9zSl0GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738380901; a=rsa-sha256; cv=none; b=UC8XCCkl24lsIWRuQhSFT5s2EYo4dKRFPq3nBmPFXYaV1tBkuyZsKg+BDIXL3KfoDnFyWh lESpkqKGizpYmOlYCVXbBmM0tOi2P5I0RfSdKPH56emGsHtPJZYel4scYalBhCRB4qg8HO trDMCljQsa+jxPprtUcSg3Jv4imakeLIOnM+WgIK6fVbAEP8vhmoUFz6dIV+2rqh57bAcF cKGpQI9PMv1wj85tQYzhTW3RFLrIzBQNFkpQGxHUw+4jCSmmXM4PYAgjA2Wgx0tWURSbc/ c0zchChY3cjQs/tkeTGK7EJR6WeHOmijkHOTsYZVc6VESRyW6Qe6qSVZJa+4Hw== 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 4YlJKx48PgznbP; Sat, 01 Feb 2025 03:35:01 +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 5113Z1fv032233; Sat, 1 Feb 2025 03:35:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5113Z1SP032230; Sat, 1 Feb 2025 03:35:01 GMT (envelope-from git) Date: Sat, 1 Feb 2025 03:35:01 GMT Message-Id: <202502010335.5113Z1SP032230@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: 81a8f67a5b55 - stable/14 - mtree: TESTSBASE directory always starts with a / 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 81a8f67a5b55905320233cbfdae321173a92a172 Auto-Submitted: auto-generated The branch stable/14 has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=81a8f67a5b55905320233cbfdae321173a92a172 commit 81a8f67a5b55905320233cbfdae321173a92a172 Author: Jose Luis Duran AuthorDate: 2025-01-24 23:10:05 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-01 03:32:32 +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 94f74392f4fb..b1a882a042a6 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1469,7 +1469,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 bd6d692e5316..27070e726943 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -113,7 +113,7 @@ MTREES+= mtree/BSD.lib${libcompat}.dist /usr/lib/debug/usr .endfor .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 /