Date: Fri, 24 Jan 2025 20:39:51 -0300 From: Jose Luis Duran <jlduran@freebsd.org> To: Jessica Clarke <jrtc27@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: <CAPwQLcfuvLBJe2RRAo7oCF3=ZygS_ragJ=uYzRAtrVGmK05KsQ@mail.gmail.com> In-Reply-To: <EC15408E-8605-4509-8E1D-DD5A27395FDF@freebsd.org> References: <202501242310.50ONAbvN074509@gitrepo.freebsd.org> <EC15408E-8605-4509-8E1D-DD5A27395FDF@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Jan 24, 2025 at 8:22=E2=80=AFPM Jessica Clarke <jrtc27@freebsd.org>= wrote: > > On 24 Jan 2025, at 23:10, Jose Luis Duran <jlduran@FreeBSD.org> wrote: > > > > The branch main has been updated by jlduran: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D01ff67f4bdf5959a719a6511= a855f6a60c0e3a93 > > > > 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 > > > > mtree: TESTSBASE directory always starts with a / > > > > Remove the extra forward slash ("/"), otherwise the mtree specificat= ion > > file will have the double slash and will not be parsed by makefs whe= n > > attempting to build NanoBSD with NO_ROOT privileges. > > Not sure why you=E2=80=99re having issues with this. I can see the duplic= ate > slashes do indeed end up in CheriBSD=E2=80=99s METALOG, but the in-tree m= akefs > produces a disk image just fine from that. In my case, I receive the following error: makefs: ./usr/lib/debug//usr: missing directory in specification makefs: failed at line 5988 of the specification I have yet to dig deeper, as a double slash should not be considered invalid by makefs' mtree. The "right" thing to do is what brooks suggested, to create libmtree, and just use it for everything mtree-related. For now, the simplest thing is just to remove it. Regards, > > Doesn=E2=80=99t mean I=E2=80=99m against fixing our build though :) > > Jess > > > Fixes: 07670b30fa43 ("Create /usr/tests *.debug file directory hier= archy") > > 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: _install= check_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/n= ull > > .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 / > --=20 Jose Luis Duran
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPwQLcfuvLBJe2RRAo7oCF3=ZygS_ragJ=uYzRAtrVGmK05KsQ>