From nobody Tue Aug 27 01:06:56 2024 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 4Wt8X06Rhvz5TjP9; Tue, 27 Aug 2024 01:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wt8X04g1Dz4mNt; Tue, 27 Aug 2024 01:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724720816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/DKFYAoKw3IRicfeHGXQoyjaEOStQ6Nd2a/W0NYDA4=; b=eosh9gDe4tcRKi1aQjFUfJkpI554k8J+ns1qgQgAvh94jMDbsE8BLWqC9ctyFAvnwuAU80 vJ+6paeVjTr3vaz02IMyzA3EmjZzPdCnfz/P7LMAt6XmJTeTYS2IoTkAw4Rm4ux6OgzlJC xIES4lX1+1bSYAjxqObUua9ecW8DRLSzERKOT1rOzOs3+l/LTQ/mzA46TsbGTjuxZctdCF hD5urQLkIJ7F1MoqfpgiAnaWNSL3X9IxQ8PRg592vcH3ahjccp6gZR5mzEJkal99Hh2pDH RZJj3pXqLlw0MOYUHHK9cA8tYtLuIqvN2sOOMKtXa8ftgrmluhflBhlopNrO4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724720816; a=rsa-sha256; cv=none; b=Lg5hXY6+wZ10E4EEzcV/FDvIASkKNQV+0/fM0Xunu/u8rTtyBy1BodFKbxVqvWPMN192ZA xciEiJRGcLzVCXz/jQlNKhfdmDjRR6M+sQJh9nWIsh+c2Nj0Ku2lLmB3uDPdJq5IEPuEXB 0yZOCXGyFMACsl4ydMW5+Ntx912355S3pJQgReVIGX+IYHcmLSw9KMGOxwUXd3iQLAXivq p8n4Ln5yleZic7Wnzi9TSB2Xi55LcBpqS9VMnT5Gw9Y21LuOGY+e0O17YD+dZU4d+aNjdO Hfx2Hm2Gr8Ju9YfYTUo5PTD2pqbaNXFSfut3Z6hMwfItTK8zfjoLB+pGk97udg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724720816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7/DKFYAoKw3IRicfeHGXQoyjaEOStQ6Nd2a/W0NYDA4=; b=u+OH+X00fM0Au8PwjtMLPdAuliDVAE+ghcBchDHPSOOdDPDMdfL8s0RMe0QGqpakvY5kTM PpkLtqNNYQacp4i0lmyPSPHPYOpqpIXNhj3EPUc3IFimDObIKndkbZYs3Q0S3RONHgKWnb K0iU4b2kah6Vh2xph2lKLs2IILnwVio35oiWZAIi8xFOAqMmCWcNcNfEibHZYwvcVhe7F1 kJYumNwXiSyr5bx95CiRASprjnJITOKqCsXF5f8koF5HbevsfsS+29OjZRD+873+Hw7VTl PfWZW75/NZRDkFKzrPHMTJYg1yxAcT4/mhBinYGRsCG4wPKRiMKb+Xnn1AijOQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wt8X043nXzV6k; Tue, 27 Aug 2024 01:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47R16uWC057869; Tue, 27 Aug 2024 01:06:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47R16u8q057866; Tue, 27 Aug 2024 01:06:56 GMT (envelope-from git) Date: Tue, 27 Aug 2024 01:06:56 GMT Message-Id: <202408270106.47R16u8q057866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 8d2b36ef6cbd - stable/14 - Fix incremental build with WITH_NVME newly enabled 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8d2b36ef6cbdc6b147d5fce93b3e2e7336c5becc Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8d2b36ef6cbdc6b147d5fce93b3e2e7336c5becc commit 8d2b36ef6cbdc6b147d5fce93b3e2e7336c5becc Author: Brooks Davis AuthorDate: 2024-04-18 13:57:38 +0000 Commit: John Baldwin CommitDate: 2024-08-26 23:39:15 +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 (cherry picked from commit 26a09db3add30238b99e3214c56a3aee63fd71d1) --- 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 2627b19d4607..a18b9ca75a45 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -159,3 +159,10 @@ if [ -e "$OBJTOP"/tests/sys/fs/fusefs/mockfs.o ] && \ echo "Removing stale fusefs GoogleTest objects" run rm -rf "$OBJTOP"/tests/sys/fs/fusefs 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 + rm -f "$OBJTOP"/rescue/rescue/rescue.mk +fi