From nobody Mon Mar 6 21:03:34 2023 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 4PVrdy33qSz3wNH1; Mon, 6 Mar 2023 21:03:34 +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 4PVrdy2Rlqz4ZxC; Mon, 6 Mar 2023 21:03:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678136614; 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=DXgat9aFc8iVhiCK9uwhhA3I+r1zPFCN6J9K3AzczxA=; b=SzjLStWqry5c7muKsfbke85YGihmyO694TeTewHEpDTXBcP2xTVbnjLcuixYVZGtt7Ew0C ClbOYqu0+9HeOgP5o1staHGSIUS/Cu/uCvSugNLOGpSrPJK/if1Q6yiP/0XQbhKSYaV8TR C6WoBjfcyDcJQ3ih92OpqL8KIH8byoRF7xit6FeyXPD2eicKMg6KpShAPYamEVLpmyQSz6 MbleMyzD1QSMpqCu9n99kbWThlEt/vJ0a3h0jlzN9eO2V15Cgek1yBMfKRhwVolXM1YF9D 6/bfr0TIyuZcsICYl6+dIOFfuT7zN14NVxtG4DbqP8Xlm2zz+WCWplZdpVueuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678136614; 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=DXgat9aFc8iVhiCK9uwhhA3I+r1zPFCN6J9K3AzczxA=; b=h23PHmMkrZAoN3lhZU92lNmFSlnlSRqBQNNKWG/Pr7+n9C0xtkW9L8WdscWf35y3rYq58s vH1Y1MmYbdw6T0oUU0401cewvqjPVskTTTQbP7/dy2SOvv3xyDpFccEax3rHs+BuymbinV 6HN8vLwp9OTwmcCLMKEpvp6wS3je/YwdkRxhLUxxxPY1UiJQvRPgjNWB3BGVZqkKPzqlKB qR9AjvXrb58IYgJehLq3eRcfhbpeo0DX377R3nllJk417n8N+UutM/q/m6jbDT2sZnPVAV KziasYrKT1LTU8YeH/Cm2S7x4rrbc4tcbqsUFmBfHfSmccEK6orwVAj9AJi5hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678136614; a=rsa-sha256; cv=none; b=xc+LGZaTHD8iz65FBZAdUAzXwYxzcTt+j93Qvf+FrOadiUNGRnX2C2yzQBaBZ2TLY94zao hN9x8Ffc+d/Wjd6ADaelcLdpMlEUXpRM0jj++7gvvjgp4R0JQ9pDhTx/acjnCOFzgSh0gu 3vveQ/2jxBfM3UbejwRDv8pJP1Ltwe78HZy5Gf090pgPR9twa2yv96SQ78V8qYAEw5vjR8 78DjPH4yoRw/3hJCWKCE1sffubu6MUDAgjG+y4WXxNsz26uvz6R/rb7eHuzdW3albXnP6D 3HghFJOhYE5zt6fGPOtXHd+5fzPyrxglPhk4RwsL7MazY2M5SKKlizTapd7g0g== 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 4PVrdy1T4jzHdm; Mon, 6 Mar 2023 21:03:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 326L3YnG068335; Mon, 6 Mar 2023 21:03:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 326L3Ypu068334; Mon, 6 Mar 2023 21:03:34 GMT (envelope-from git) Date: Mon, 6 Mar 2023 21:03:34 GMT Message-Id: <202303062103.326L3Ypu068334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: d7a491dd3037 - main - make showconfig: set MACHINE and MACHINE_ARCH 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7a491dd3037030a09e579225899cd0617a5ef4f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d7a491dd3037030a09e579225899cd0617a5ef4f commit d7a491dd3037030a09e579225899cd0617a5ef4f Author: Ed Maste AuthorDate: 2023-03-06 15:56:13 +0000 Commit: Ed Maste CommitDate: 2023-03-06 21:03:22 +0000 make showconfig: set MACHINE and MACHINE_ARCH Previously these were not set for the showconfig target, so took the host's value rather than the target. As a result some machine-dependent kernel options were not reported with correct defaults in the src.conf manpage. PR: 269994 Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D38926 --- Makefile.inc1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 542121976333..2767a6038354 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3390,7 +3390,7 @@ check-old: check-old-files check-old-libs check-old-dirs .PHONY # showconfig - show build configuration. # showconfig: .PHONY - @(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes; \ + @(${MAKE} -n -f ${.CURDIR}/sys/conf/kern.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}; \ ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes) 2>&1 | grep ^MK_ | sort -u .if !empty(KRNLOBJDIR) && !empty(KERNCONF)