From nobody Wed Apr 24 18:31:44 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 4VPndF0Tskz5J6Lr; Wed, 24 Apr 2024 18:31:45 +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 4VPndD2qfQz4347; Wed, 24 Apr 2024 18:31:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713983504; 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=M751VqXBxg80UHckkKhKXxyu8ny0c/9mmAxmq3RLoP0=; b=ngsbOHsXU8+v2ywYu96eQmfjrwlWp+q7wWL6218zydsJavOLi6fRnuQqED6WL2U7gr+Awp eOv8XTAretaceKJHzVJ0eeC3hZ/nwHl02Zl0PSq41VTb1I58cuYQ+kHCjhB0h+TLCXjnk5 AavuC9lz82ewcpZdDnB4GWN/eww98AWaT45dPoIqirB+EFQt4g7I15dXZDzn2b7fxp+HSj JfEh6LH/JLTd530LbRlNXg2ge2PtbcTiGWU3MhQjUeipK0v7Gb4AW4JlD3PJzhtErFf0ZD UQl+veRIzs0ZjpcSnsux3jegXQasU0+VKpWjnyR5m5YIGDwAfL3+i363KIWHwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713983504; a=rsa-sha256; cv=none; b=UtN68Wda6SqnHseNI/o/WAfkVcW3j5kt/IJo/DGeJ4JRe7GPM8r8FSmsJ++LjI8owHUD6d ER7oXqxBUSdcHMxbVy1E2ifTW/18r4bwp4T03IQbuhc72OKT9kjInKG+qb0gblDN7V/uVG xI0Uphe0YU1qhN/IYGSuElTK+mLOpPjmkbMFBmQLGw3uHoqT/LSAnuMA4uLQ16M4EpFrcJ 7uAp2J8WiFgkcCTMakEhBa0N5XovELF72Dd7/EcgX1zE4f0jFP2cU9iLzC3x+EDX7AsHlh uCOwiurcaoui5vYMrfQ0nhOIIc1YKJ3dWeTaORBmApjauB3EoMMrv7NJQ0ZTwQ== 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=1713983504; 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=M751VqXBxg80UHckkKhKXxyu8ny0c/9mmAxmq3RLoP0=; b=wE5xUr5iwqe9IvsWRfFNcRYVZi4KXukx1bpAbKQvQN8Bq11TREFvQRsN62jkiZIaVMVCXl KqyHU54nDZQ5FA+VHZvAc88oHEqnAjG3YtNkUqL41rAKhBzJzgQDD9O0Dhqn61YFCwk86a kul2+OcxWNPfdzImKs8hle6MriRa19WPk1Gd/mPysUsyno68ukYGBsdxD/wQ5/yaNGgcML V5CAv5w6cwyBc4TdM3ASUqXcxlUQl4sSz+x6Ztf3AEw2Y5lEndvS8dwVHmxf/NA1qNzHcR qGyZj/XtuB42hSdwTuYMgbbFvan/raloWzYkUKIubQPAoDiG1gKDkt/XHIIR+w== 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 4VPndD2RxvzQqq; Wed, 24 Apr 2024 18:31:44 +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 43OIVict091288; Wed, 24 Apr 2024 18:31:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OIVigU091285; Wed, 24 Apr 2024 18:31:44 GMT (envelope-from git) Date: Wed, 24 Apr 2024 18:31:44 GMT Message-Id: <202404241831.43OIVigU091285@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 2c35c867ba05 - main - showconfig: Set MACHINE for src.opts.mk 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2c35c867ba05c8de167e1597c9044a72febdda63 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=2c35c867ba05c8de167e1597c9044a72febdda63 commit 2c35c867ba05c8de167e1597c9044a72febdda63 Author: Andrew Turner AuthorDate: 2024-04-18 15:22:46 +0000 Commit: Andrew Turner CommitDate: 2024-04-24 18:17:20 +0000 showconfig: Set MACHINE for src.opts.mk Also set MACHINE and MACHINE_ARCH when reading config options from src.opts.mk. This ensures any machine-dependent options are reported correctly. Reviewed by: emaste, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44838 --- Makefile.inc1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index a0fd539ed25f..0728df1221a0 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3598,7 +3598,8 @@ check-old: check-old-files check-old-libs check-old-dirs .PHONY # showconfig: .PHONY @(${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 -E '^(MK|OPT)_[A-Z]' | sort -u + ${MAKE} -n -f ${.CURDIR}/share/mk/src.opts.mk -V dummy -dg1 UPDATE_DEPENDFILE=no NO_OBJ=yes MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}) 2>&1 | \ + grep -E '^(MK|OPT)_[A-Z]' | sort -u .if !empty(KRNLOBJDIR) && !empty(KERNCONF) DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/