From nobody Thu Apr 18 14:24:31 2024 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 4VL0Qr09pqz5Gy50; Thu, 18 Apr 2024 14:24:36 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VL0Qq50VDz4ZG8; Thu, 18 Apr 2024 14:24:35 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTPS id xNy9rv9W5drxExSgkrRzoY; Thu, 18 Apr 2024 14:24:34 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPSA id xSgirgzNApsbgxSgjrjP9Q; Thu, 18 Apr 2024 14:24:33 +0000 X-Authority-Analysis: v=2.4 cv=Ff+Ux4+6 c=1 sm=1 tr=0 ts=66212d21 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=raytVjVEu-sA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=fLIEOv6QJ93joT2cqVAA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 0D0E6B76; Thu, 18 Apr 2024 07:24:32 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id D835626F; Thu, 18 Apr 2024 07:24:31 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Brooks Davis cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 26a09db3add3 - main - Fix incremental build with WITH_NVME newly enabled In-reply-to: <202404181358.43IDwc0K076177@gitrepo.freebsd.org> References: <202404181358.43IDwc0K076177@gitrepo.freebsd.org> Comments: In-reply-to Brooks Davis message dated "Thu, 18 Apr 2024 13:58:38 +0000." 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 Content-Type: text/plain; charset=us-ascii Date: Thu, 18 Apr 2024 07:24:31 -0700 Message-Id: <20240418142431.D835626F@slippy.cwsent.com> X-CMAE-Envelope: MS4xfEkfegDGALFcS5iIQWK+vp+eNSaJ3HAghCZp6x4YeEiwzs43tpy8s4nlgnEpuUkE2POxlkcRYQ7jOSNZ2rfbsHTy6SZ7NLHL6Q3QCI5Q2MBOsyqnaZI6 MFkAbwcPK3bXxw2j7zHs2E+Y4m/x8KvSUk2F2ZLOHy9FsuZKycDPhqqi5Sue4iIHJegADaWRujeGJlSdqQeEXncrHWxTsPDQIP7qaNm90aekiSJiu7R4ogGY YrmtvfhymH8fgXxTJWgGSy502HvuwmUx4OaBgIDRJBjOPqfdiPFg0ne2yKbpp+XCli++ymPjm0u4FjwxLPj48mf+3Ybx27TKEy6T5fuEuYw= 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:16509, ipnet:3.96.0.0/15, country:US] X-Rspamd-Queue-Id: 4VL0Qq50VDz4ZG8 In message <202404181358.43IDwc0K076177@gitrepo.freebsd.org>, Brooks Davis writ es: > The branch main has been updated by brooks: > > URL: https://cgit.FreeBSD.org/src/commit/?id=26a09db3add30238b99e3214c56a3aee > 63fd71d1 > > commit 26a09db3add30238b99e3214c56a3aee63fd71d1 > Author: Brooks Davis > AuthorDate: 2024-04-18 13:57:38 +0000 > Commit: Brooks Davis > CommitDate: 2024-04-18 13:58:17 +0000 > > Fix incremental build with WITH_NVME newly enabled > > rescue.mk doesn't get updated when options change so nvme_util.o is now > missing on architectures were NVME was previously marked BROKEN. > > Reviewed by: imp > Fixes: 2fda3ab0ac19 WITH_NVME: Remove from broken. > Differential Revision: https://reviews.freebsd.org/D44826 > --- > tools/build/depend-cleanup.sh | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh > index 71988e526369..a7b4f99cbc5f 100755 > --- a/tools/build/depend-cleanup.sh > +++ b/tools/build/depend-cleanup.sh > @@ -228,3 +228,10 @@ if [ ${MACHINE} != i386 -a -f "$OBJTOP"/lib/libsys/.depe > nd.syscall.o ] && \ > clean_dep lib/libsys syscall S > clean_dep lib/libc syscall S > fi > + > +# 20240416 2fda3ab0ac19 WITH_NVME: Remove from broken > +if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \ > + grep -q -v 'nvme_util.o' "$OBJTOP"/rescue/rescue/rescue.mk; then > + echo "removing rescue.mk without nvme_util.o"; then ^^^^ Stray "then" breaks the build. > + rm -f "$OBJTOP"/rescue/rescue/rescue.mk > +fi > -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0