From nobody Fri Jan 24 23:22:24 2025 X-Original-To: dev-commits-src-main@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 4Yfv3y6XFpz5lYq3 for ; Fri, 24 Jan 2025 23:22:38 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 4Yfv3y3T97z3wBP for ; Fri, 24 Jan 2025 23:22:38 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4363ae65100so28005685e9.0 for ; Fri, 24 Jan 2025 15:22:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737760957; x=1738365757; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4yOIwFP9tIaXY3rlOwjSJHGZQH1vIu9fAgJsxenS3zg=; b=IXytceGhmsHRXQHAsolRpTk16KE6ucK+fAA9ztPa3XNFAcdVSpRYUrevnKeJH9oU02 jX3tUx4mPldctOi29p3uDcJFNfQ2/VT8SSZjbcIG0cwr3ilz63QBWTO7zkOhkhbyotRY zjLnz/ZjT02DpNfEOAupYcX5iHYpBKZC6Mv7U6uhTzCmxg2eYThdEqSH/GYPYo+cTHFx glgpxDSefx6YHrcP3jrcmh/RbA/1W86oH7WlfuhfqslD4Biz2AothAq6a6dcteZt2mx0 gMOPrwG68HLgL6sEmHKIZrUb4nxGS7wqW6utuSJpw9KckSQWkcUX96sRc/wETwtCOqBu gAjA== X-Forwarded-Encrypted: i=1; AJvYcCUKYJr+Snq5hqShOzuOnv6dEp3la/uahsJtddEALQtDOmqUm0NWDhm+8/5Ajxz5sT50AmXIQTXeyWp0MSO1gEEdMxvI4g==@freebsd.org X-Gm-Message-State: AOJu0YzdCtvrbPgjt8xbK5HKESSOTZB22RvrbqIJYHrUb5YIViAR+Kbu w9uygLD0NdR4O0qVHMsqcSfBjcLKaQnKGo+xZf1e3r8k1ykAjMWwScG2JaWpZfNJ9DeGjRiUBG+ 0 X-Gm-Gg: ASbGncvqxulHPPrb+R2Wn4my2pUqCp1qTTUB93KrcVS9shLADenqq3qDjOL0vKOs5hb MxBaiSUSHyaNThhZt2K0H3BcUEX8zG5ny6gSI3UAL6Thf3HErJNqiSsszBhmyUQkYmzVXDEg+82 yYzJuqMlWl230PIpjYGr4coOYtwGi5hR6nSAZ5IklNyXT5ld80zqfo0rg43jFl1uO4tM07DyiXG phwNfxaJ+o4Jejkw9eo7YNJi7jLXKhWUkYmsFV9cSZM4Luo1kf4mZ3L40a9qMdOm6ojHe9BmghC 8HuxYyYKcV3TQFcogDT+pJbFeCwQ7Q== X-Google-Smtp-Source: AGHT+IGk47TqCu7dfUmtjgzIwBYJ7EMcr4Yk76ix5uQMRH3S3dJI4hEVwpEJJMpprzeIpIO5XFyWrA== X-Received: by 2002:a05:600c:468d:b0:431:542d:2599 with SMTP id 5b1f17b1804b1-4389143b715mr289751535e9.22.1737760956480; Fri, 24 Jan 2025 15:22:36 -0800 (PST) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438bd501c2dsm40719945e9.13.2025.01.24.15.22.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 Jan 2025 15:22:35 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.300.87.4.3\)) Subject: Re: git: 01ff67f4bdf5 - main - mtree: TESTSBASE directory always starts with a / From: Jessica Clarke In-Reply-To: <202501242310.50ONAbvN074509@gitrepo.freebsd.org> Date: Fri, 24 Jan 2025 23:22:24 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202501242310.50ONAbvN074509@gitrepo.freebsd.org> To: Jose Luis Duran X-Mailer: Apple Mail (2.3826.300.87.4.3) X-Rspamd-Queue-Id: 4Yfv3y3T97z3wBP 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 24 Jan 2025, at 23:10, Jose Luis Duran 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 > AuthorDate: 2025-01-24 23:10:05 +0000 > Commit: Jose Luis Duran > 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 /