From nobody Fri Jan 24 23:39:51 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 4YfvS45D4Fz5lZJC; Fri, 24 Jan 2025 23:40:04 +0000 (UTC) (envelope-from jlduran@gmail.com) Received: from mail-yb1-f177.google.com (mail-yb1-f177.google.com [209.85.219.177]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YfvS418Zmz3xmS; Fri, 24 Jan 2025 23:40:04 +0000 (UTC) (envelope-from jlduran@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yb1-f177.google.com with SMTP id 3f1490d57ef6-e3c88163a00so453864276.2; Fri, 24 Jan 2025 15:40:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737762003; x=1738366803; h=content-transfer-encoding:cc:to:subject:message-id:date:from :reply-to:in-reply-to:references:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=cHYA+1PUIDy1xM70KT++xD2NnG1PZv+Mv75fCj+YG20=; b=PePWi3cj6NbN5tdvROElbSMVt8+/nPLf6U/B4zNvrSR6IHkfEzHd6KrIewLUZDlx21 wg8n196os86tvl081qhK1YPMM6sBetpUSXs3mrANewMZ8yiL9gCzqJnLXYG3+YOgxwaS zV6xDHYmYl6FH3fkLuTTpRwPOw+cF2m+APAwQ2CGijf9PQxU+Yu0RIps9a1Q5rPqQH7y 6PEsqp3B/6Hyo4EQhVGrI9aQ7N0xV8TD/Bov8TfqdteK/LKls/XCOFcm/kCHLblDL+8i tAwxlrmTrUpxXHodT/SPIZrWCP7qew0fzAjkSRjCtQFxYgPC0MNMLWbVe1hG+alzVwdE Ry1Q== X-Forwarded-Encrypted: i=1; AJvYcCWJdKVOQ++34muveTk5/61ASKERZsMVj5Y9jsuIy4pxc/HWJG/Bu7O2pzrbQKjfwdUsrOe2GY4zVU2Ku05xEoDE68Oq3+4=@freebsd.org, AJvYcCWLgUkhEy6xGFoelLiKEIJiir73qczKV/Np/CKxSZ2KLfryvMe6bp8y2X91CRKNEHkhEOUKnXdWCZkWLPu1/TsfSytB@freebsd.org X-Gm-Message-State: AOJu0YxU4myfU/m6hSollf6nOL26vPYlJazDxqACIpxbyISBaik9/+v7 uQDoz0eLcvkjxH8k0CU8XlwccHWmjMqhH5qk5hEuvxy+k25p6CQGmGL0jg== X-Gm-Gg: ASbGncu7qqgceS2aR1NkCm7dhdL1E97N559/9cX1A95Nw7yqnJAoJffiwUVY9cxauAA G6LGZOs3S6sXi8f8Ch3VLccH82aIsrwiBPqrZMJmQA3ly55U8NSKynustD9kvhiSe7Mb8cfVC0q +UxNG84DxxaT4lBvRtWiSy+JsWnAzV0xzfnswobpSu6eaDj98IlZSCu50Iz+kp5V0sVJTLSeHXL BUs5omG5W/5msYRIbXeiBB96dpcr03+OVUP2PJLrVGVW39VEw83rFVwrq7T11hX4iM/bGm54SvG PKhiThnrxAl2L9JxUWFS6DNkDVmyUhzf2BMNZzaOm1awNw== X-Google-Smtp-Source: AGHT+IGNjPUj502m+WbTEphvFp4yDPKVvE3nMvf9jtdPqOxj++Qoe1fSQsoIOkXUr6yV0vCJwkFGeQ== X-Received: by 2002:a05:6902:1614:b0:e38:b7b8:51a8 with SMTP id 3f1490d57ef6-e57b1364842mr10618598276.7.1737762002860; Fri, 24 Jan 2025 15:40:02 -0800 (PST) Received: from mail-yb1-f174.google.com (mail-yb1-f174.google.com. [209.85.219.174]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e583b746626sm554152276.7.2025.01.24.15.40.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Jan 2025 15:40:02 -0800 (PST) Received: by mail-yb1-f174.google.com with SMTP id 3f1490d57ef6-e422de4d1c5so425232276.3; Fri, 24 Jan 2025 15:40:02 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCX1KdfaBc3tPoeQ8asXBMHtYyBdKQYVjQMwRI6OTnQCTuf+XyEvVtBAz5LDNX/pbP8N9Sj90wG0+WHD7Sh7Sf4VzMmG@freebsd.org, AJvYcCXI6AlJ+0uTvdAWB/o+YJn9Fjfs3e4LJd5Hb5KFvL8rABPKzO4fA/5oTKRvRO9p1IJhGDLUYebv0b5BybnJH3aMZjH75yg=@freebsd.org X-Received: by 2002:a05:690c:7342:b0:6f2:9533:8fb6 with SMTP id 00721157ae682-6f6eb661175mr102909067b3.1.1737762002245; Fri, 24 Jan 2025 15:40:02 -0800 (PST) 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 References: <202501242310.50ONAbvN074509@gitrepo.freebsd.org> In-Reply-To: Reply-To: jlduran@freebsd.org From: Jose Luis Duran Date: Fri, 24 Jan 2025 20:39:51 -0300 X-Gmail-Original-Message-ID: X-Gm-Features: AWEUYZkQkULc-iVrJ_DxAmKP-Kx8sij6ZxrxI14x_g8I7IhYrHDZx5yK6HsBKa0 Message-ID: Subject: Re: git: 01ff67f4bdf5 - main - mtree: TESTSBASE directory always starts with a / To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4YfvS418Zmz3xmS X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On Fri, Jan 24, 2025 at 8:22=E2=80=AFPM Jessica Clarke = wrote: > > On 24 Jan 2025, at 23:10, Jose Luis Duran 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 > > 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 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