From nobody Fri Jan 24 23:10:37 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 4Yftp56fNpz5lY83; Fri, 24 Jan 2025 23:10:37 +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 4Yftp55BMSz3tkq; Fri, 24 Jan 2025 23:10:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737760237; 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=geKoixrXUS7R9xAHP3wI4UUZzvf/gAd/PH4eWEMEkhE=; b=uw4unK0HebuO1NdHrINT6zJiXF0QCDqGOp3VE3+qQ4LQFXeTI+S+K4GVuJFw2MqWWaUfD1 Qk/rcxFUxwZYTY4so3VJQ3DyW90EipaiTDhxqHCrZT1Od1uF+l1UyDEI7sqoOJm8fKdR6o 7EH6FIRxfofHkEqloC0Ir3FQ7OcVW44PkLGhIVHb75BQG5OSzQo9h4DViAFsoN4DWngv5n OYGOiFUByR0KfHF+6wmmilhPyNv51b9a93/jp8BU08CmtKigys5/qieE8udvEouaDQGZ0E 0TBYBBui0u2DnnqtbdJ1tyXuSb2Is0fYvuPVZwnsooZxn1wzlNMrxNPn40fwtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737760237; 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=geKoixrXUS7R9xAHP3wI4UUZzvf/gAd/PH4eWEMEkhE=; b=vZav0TF0xlR8WSNmCsuzEDSmWxMeNSAADlSk3pwgwCqudET2NQTUD3KEJa5al/gusTctzJ nDPYgA/9HzGRNhQ1ELlqVVfCR8Hq6d0YhuWqPpxky7X0Mx84A7Z5U87lvA9QdaC+8I96MZ Ln+3drawEWa8pDFWSN1x13aDOeBkSGgE7l8AecW7GL0KExMs29KzZKsiJnnaA7aM+QLem4 PDiUI4ddrGOTET8zbjOf3wkunoMNX81Nz0MLqy3SMiQOch5Bch+grhyOZsioo8CyAPnyli 7gnEzN4mQE3c+7Fb5Jb02ZHmRJNozrZWgwBc4KjaDXHXdyDvWY8zbn3r6lgOfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737760237; a=rsa-sha256; cv=none; b=yQx+H/hJtju/FtASlY6QEr6l95wHnlXwuLacw5wiJg9Cdi0bQq/ZqhvYT1w5eCpwnf2918 xe9P2sIZ/kFUDir9cShIAp59tEM5m/92AYrM/gEahEAlAhhlZ64Swj5MuaxYEBSpz0kS8D wB/EWbyTWqm3hnaEcS8hOIpy06yqkz6RquQlBv6Bj/f282P56JUmVFzzmtcTA75PSN3VBj 01l5+8NELQRnQmUwlViRo6FrC9PirpzmT1xe7v3TZIcqj/iokkC6tXt8K1ki0f8xT0K+Sx vH5sS69nGSO7hDzKqlqJae2jBd8RmT2QR+H14ihr1aOv2s9V/hJouMW7wAu+Ow== 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 4Yftp54lrKzlvw; Fri, 24 Jan 2025 23:10:37 +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 50ONAbc8074512; Fri, 24 Jan 2025 23:10:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50ONAbvN074509; Fri, 24 Jan 2025 23:10:37 GMT (envelope-from git) Date: Fri, 24 Jan 2025 23:10:37 GMT Message-Id: <202501242310.50ONAbvN074509@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 01ff67f4bdf5 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 01ff67f4bdf5959a719a6511a855f6a60c0e3a93 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=01ff67f4bdf5959a719a6511a855f6a60c0e3a93 commit 01ff67f4bdf5959a719a6511a855f6a60c0e3a93 Author: Jose Luis Duran AuthorDate: 2025-01-24 23:10:05 +0000 Commit: Jose Luis Duran CommitDate: 2025-01-24 23:10:05 +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 --- Makefile.inc1 | 2 +- etc/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index efa1299b76a7..4383b4bfe30a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1506,7 +1506,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 ${IMAKEENV} ${DISTR_MTREE} -C -f ${.CURDIR}/etc/mtree/BSD.root.dist | \ diff --git a/etc/Makefile b/etc/Makefile index fdcad75911c8..d3cb6b679dc5 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -112,7 +112,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 /