Date: Fri, 24 Jan 2025 23:22:24 +0000 From: Jessica Clarke <jrtc27@freebsd.org> To: Jose Luis Duran <jlduran@FreeBSD.org> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: 01ff67f4bdf5 - main - mtree: TESTSBASE directory always starts with a / Message-ID: <EC15408E-8605-4509-8E1D-DD5A27395FDF@freebsd.org> In-Reply-To: <202501242310.50ONAbvN074509@gitrepo.freebsd.org> References: <202501242310.50ONAbvN074509@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 24 Jan 2025, at 23:10, Jose Luis Duran <jlduran@FreeBSD.org> wrote: >=20 > The branch main has been updated by jlduran: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D01ff67f4bdf5959a719a6511a855f6a6= 0c0e3a93 >=20 > commit 01ff67f4bdf5959a719a6511a855f6a60c0e3a93 > Author: Jose Luis Duran <jlduran@FreeBSD.org> > AuthorDate: 2025-01-24 23:10:05 +0000 > Commit: Jose Luis Duran <jlduran@FreeBSD.org> > CommitDate: 2025-01-24 23:10:05 +0000 >=20 > mtree: TESTSBASE directory always starts with a / >=20 > 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. Not sure why you=E2=80=99re having issues with this. I can see the = duplicate slashes do indeed end up in CheriBSD=E2=80=99s METALOG, but the in-tree = makefs produces a disk image just fine from that. Doesn=E2=80=99t mean I=E2=80=99m against fixing our build though :) Jess > 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(-) >=20 > 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} !=3D "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+=3D mtree/BSD.lib${libcompat}.dist = /usr/lib/debug/usr > .endfor > .if ${MK_TESTS} !=3D "no" > MTREES+=3D mtree/BSD.tests.dist ${TESTSBASE} > -MTREES+=3D mtree/BSD.tests.dist /usr/lib/debug/${TESTSBASE} > +MTREES+=3D mtree/BSD.tests.dist /usr/lib/debug${TESTSBASE} > .endif > .if ${MK_SENDMAIL} !=3D "no" > MTREES+=3D mtree/BSD.sendmail.dist /
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?EC15408E-8605-4509-8E1D-DD5A27395FDF>