From nobody Thu Apr 18 13:58:38 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 4VKzrv2jtDz5GvjQ; Thu, 18 Apr 2024 13:58:39 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VKzrv14yjz4PKM; Thu, 18 Apr 2024 13:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713448719; 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=qfzkiu4zdv2z87uJ0AUnApi36itbLKq4an6aMoVCtm4=; b=s29nLKcNy/cgqMBYna1DrP0m1HJGBtn1twN5yDB3ogz9g7b7zY8VORe30l58WOHt/+iuAi KdaL7YbDkpymUfomdsDXgrjeSNnLZ4GqcsUXAH7uc9I/wc0848RrI0X3S9T2lmfsNoKbGX QIHikW7aqJyK4tQPROTopDrsdAVqPHi+xQnppFAcuscGvYTxY8vKSxE1S5Z37Innmzq/f0 M2XjDfyXSEE1lHGfrLEsOdRYqgFCtfGcTKpb8bI73t+1zptan+zUiUayHRC3tp/GDDXzE0 1Gk9ohfuy5VJ/B0UyeLTMqo8T9mxcatuIdOPsoDC2kPl4vsmgbaztTI1ALtv6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713448719; a=rsa-sha256; cv=none; b=MwrysMjR2nalrd+c4bAItcBg9V8pDgIPPUVnjzfYPZ1CMXp1BtJEqpp8KwDBF3EexnOPHw Cow+iMM7vlRAVp3CvPTSr5bBHY26h3yGgu+J/yLKo5nH4dJkSaXjoP5nftoWEYAr2HBUGH +fX2PdiStECQklftcYsuR0iyZG3xwAF9PeWqt3yw1pIDbwWM6/bITfUMKbQ2mvowO8beV/ 3SBjlyoqKkI2d/0cJAE6BWUDt5xLWqOgXHgd/DybWFLFkSKVRTabOx7D/k1wUtnhHOO96v 6NQv4e/eFvsPkU9mFyualxcDT/3TacVml49gaeRKfmn0Klrv3RYfRmlDAbvsIg== 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=1713448719; 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=qfzkiu4zdv2z87uJ0AUnApi36itbLKq4an6aMoVCtm4=; b=Y+hWA/yqI/IWVB+3nNVf4fdxWhLnGK76RgWCUdKSN4ZM9DPhFRUyMO626QcyO7KVsIeTOy PQqbeNo70GwDzDihymAjhaASBxsYvo7XwN3GS7Efi1koAaXHuBiUEPs1HywR/07kuXFE1K e2waLcuPE+ddsODNJP9zkKUmfI6txD1DHelG683+XBpEsq2vjVintzE3IrIm9Pqn0/UUw2 Owts4ulF/rkYn8nDqvGLI/q+8ZOZNyulz19d9Xwiysr08RFcWa9iNJqGRLXcDRP30Iq0j9 DC66nB6rGMjm4ftCIH0QPxZhjT0CONHu78CtW3v4QG4hpw/rlu/cMz8xJpCXgA== 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 4VKzrv0fGrz1Bg9; Thu, 18 Apr 2024 13:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43IDwcqo076180; Thu, 18 Apr 2024 13:58:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43IDwc0K076177; Thu, 18 Apr 2024 13:58:38 GMT (envelope-from git) Date: Thu, 18 Apr 2024 13:58:38 GMT Message-Id: <202404181358.43IDwc0K076177@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 26a09db3add3 - main - Fix incremental build with WITH_NVME newly enabled 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26a09db3add30238b99e3214c56a3aee63fd71d1 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=26a09db3add30238b99e3214c56a3aee63fd71d1 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/.depend.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 + rm -f "$OBJTOP"/rescue/rescue/rescue.mk +fi