From nobody Fri May 10 14:36:14 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 4VbWf71t1Hz5JZGK; Fri, 10 May 2024 14:36:15 +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 4VbWf70mpQz4kpC; Fri, 10 May 2024 14:36:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715351775; 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=WYIkoRsYsSrptJa8gdFJ6cKfokChaGZKfjqBUbcN0kI=; b=va6WJofQ8vtW7VvGyIG9VbbqKsjkINxec5nj2xKnk4WY3X379BtZDEMp/wCxVvgmka6S7H nInBD7I4210ym7KQQ6tXPgDcodFce5psvQ7NQN17tk61ThOXRF1Ga6x7jUlcWTHFrmocW5 I+vt7VUQRB9c2MnTM92iJRBYwqkwti+jWqi0aL075nQKVN483x3fPhgPYzqXlQ6LBI86Gs uN1HA+ag/UzEcKCq6sRk4NTTT5m0Eh+pjZZGamAPjBktl1qlnZVoXMhWFv4vEFKNs/r4XB TOIkpWrglRPfyQ5ZphnsJgHlQAuHnIdwcYxRBLsIcSaWP+kssAMCUKMPSVzLTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715351775; a=rsa-sha256; cv=none; b=oR2xGJcoRvWaw2cEgobRm2n/zy7WZmKw8u8IxsiKAGJxISZWDc/NolMkac/F1ypRgQmX3L k3V5yXTZSgsp8bsfHZv14Z69LPc8r6VRfJqnbPERl2asneTCkljrKybtygQEmf/52CJEJP f0HFzlgE8d2vMgXsRUwUF3qm0HZE3wcgPkb0bwoE6z9Dnx1wY6jPHOeNrZsWJGRM47EyH9 tcCiKmuGVf4EVWXZ/d0RD4J3BXTGa3TS7g2nEuMB2ouEDO81SKWwzCjwGwpPfB+ilLB6sj FL0588tAXd29p3XfjMDPIBcCE+KjNF642YUa1NfRPQzMi+f6n+lRkL7rPHS/Ig== 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=1715351775; 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=WYIkoRsYsSrptJa8gdFJ6cKfokChaGZKfjqBUbcN0kI=; b=o+f5ryPWvRwI40ILeyP0/KLSsxCBvb6m5Kwql41QcTS3TH+/8ySFAd0/bE9S1l2exkmq3h vHbj/Uc3afbboxB0L3mdVoi5vIYrriBdUiiMwZnYZw2jcjzs1IJdFe6NvTutPxm/xXZFUn 8Q1dZ1FBAIcVQ9O9tnlom4Fp+S3nuzbnPV5T7U3KmlLvQyfwiYXRbhsnUMiUasMfzTUXNb lojNVrIeRZZ5d7C7EYG37jqg9VkwtxBZiOsSwZiTrb0UAWApIaSCDlfUl2Vw5WMGMKi2Dd pODLy//hlpElHZNo77f6Jw3029XjoDreQvaAPYxg/T3GxGsZhG07hfKGbOrDtA== 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 4VbWf70NpZzh3L; Fri, 10 May 2024 14:36:15 +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 44AEaE9O003799; Fri, 10 May 2024 14:36:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44AEaEc8003796; Fri, 10 May 2024 14:36:14 GMT (envelope-from git) Date: Fri, 10 May 2024 14:36:14 GMT Message-Id: <202405101436.44AEaEc8003796@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: de1ac9462f31 - main - conf: Generate fdt_static_dtb.h in OBJDIR 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: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de1ac9462f31956a98e9953009f02a0e39eed283 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=de1ac9462f31956a98e9953009f02a0e39eed283 commit de1ac9462f31956a98e9953009f02a0e39eed283 Author: Justin Hibbits AuthorDate: 2024-05-09 19:46:09 +0000 Commit: Justin Hibbits CommitDate: 2024-05-10 18:35:50 +0000 conf: Generate fdt_static_dtb.h in OBJDIR Though the kernel build expects ${.OBJDIR} to be equal to ${.CURDIR} that may not always be the case. Correctly generate fdt_static_dtb.h in ${.OBJDIR}, which is conceptually more correct anyway. Obtained from: Juniper Networks, Inc. --- sys/conf/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/files b/sys/conf/files index 7fd79bb0345d..56c92f51947f 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -19,7 +19,7 @@ bhnd_nvram_map_data.h optional bhnd \ no-obj no-implicit-rule before-depend \ clean "bhnd_nvram_map_data.h" fdt_static_dtb.h optional fdt fdt_dtb_static \ - compile-with "sh -c 'MACHINE=${MACHINE} $S/tools/fdt/make_dtbh.sh ${FDT_DTS_FILE} ${.CURDIR}'" \ + compile-with "sh -c 'MACHINE=${MACHINE} $S/tools/fdt/make_dtbh.sh ${FDT_DTS_FILE} ${.OBJDIR}'" \ dependency "${FDT_DTS_FILE:T:R}.dtb" \ no-obj no-implicit-rule before-depend \ clean "fdt_static_dtb.h"