From nobody Mon Oct 24 18:13:56 2022 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 4Mx39c3BZqz4gNFq; Mon, 24 Oct 2022 18:13: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mx39c249gz3qJT; Mon, 24 Oct 2022 18:13:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666635236; 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=OiCN4bJfwL4cnXTf1+BCPheV6sVRZ1rcuxV36Az3cyY=; b=ImR+wh1s59XpoKumLv80GMOaECa2qqAXE11kRnIEXC6qRojOun3yhUHZ3Z6konSwwFfwEj RkaCiuCa7cYaJjocInEKf+AQue99tmVoXzsLkqa9hK3Au7THx1UqE/sI6/rKAH6zc/ErA5 swMsSsigtPU8qc/3M5dAcD3otGH/FhPmoUIWEZgPX1ugFYrG+ouC4ulLZivOxPj21RkXje 0GTLNeesxGR2FvUk+VxKk0ii5+eGIBildGBRS1WDFu0LWBVRVKa8hdq5B0tMWTbhf1KY8q O5XIFDPRJeeKNoNVJ/SGqCbb/mZs8a3DWni4b2ySK9tAOOkE0RLHDfDnn2IKXw== 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 4Mx39c16yRzKBQ; Mon, 24 Oct 2022 18:13:56 +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 29OIDuOs088441; Mon, 24 Oct 2022 18:13:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29OIDuur088440; Mon, 24 Oct 2022 18:13:56 GMT (envelope-from git) Date: Mon, 24 Oct 2022 18:13:56 GMT Message-Id: <202210241813.29OIDuur088440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 4355ab6f04b7 - main - config.mk: All options in DEFAULTS are now defined in opt_global.h 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4355ab6f04b79b43682e2643926e65f4ef1fb33f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666635236; 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=OiCN4bJfwL4cnXTf1+BCPheV6sVRZ1rcuxV36Az3cyY=; b=WUTiIs3zUtUhyBiFCv16fwMZ+/pmCII9UkpJZiixD06aDmBOOXnCQmnJmVwIFdRpKih/jz 2FNKV1aX+dlfu/vsblXOho/MQsXarmmwlnSdeF2tQNz3scfDnJrkX3qu4Qtrhgbozf7EsP c9xD57OcTKIBzYrkMDuCzQp5kZZMIfgQ/sXmVCSASm+VtNE+y73LnJNioo1OPdC2bNNqmt KFLRdkXAdt8+a6W6JQhyV800NvR1W/qLVPAn9s+lfvrFJdRFmFKZOPodP/D2X3EeiPPkRO gWpVnGuf/v7rIP+b08xTgGhRzJk7sB498Zf7fSLxfXKExSZHPLbrMS6IbSfBRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666635236; a=rsa-sha256; cv=none; b=HM3Ez9rFKvvbDhoUlCw6uYl75UqI4ZdAzSHs5F3+xLK4kcnN+L4IC0zfvS5putK9Ql+Ikm YpD33UkYmmkgfFquoz2adu7gOxi71n/5H6CuYq4rhs9WTz7OaNp8B3+ir9RSTE4+QZ408d F7B1zC5DPmzhXPycuHD91BtQu2YE9IEU1yKFMYcDbwKvEquLBNhIAHZFoSNsxcATyJymVS DWBbYKE7FUM6G6M9pRmAQzSt04303Smnku8DgDsxTu4RucIj07ed1TNhr4wiI5JkJlO2H4 tN+mHEAi/iD1+P2a9+w1MLTgKxmrZwN3Hv38XfLAaxdycppqDb5QVo4ljCryBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4355ab6f04b79b43682e2643926e65f4ef1fb33f commit 4355ab6f04b79b43682e2643926e65f4ef1fb33f Author: Warner Losh AuthorDate: 2022-10-24 18:12:17 +0000 Commit: Warner Losh CommitDate: 2022-10-24 18:13:04 +0000 config.mk: All options in DEFAULTS are now defined in opt_global.h To simplify management of all the options that should be enabled for the different architectures, adopt the convention that all options listed in DEFAULTS will be #defined to 1 in opt_global.h for untied builds. Except for GEOM_* and ISAPNP, they are all in opt_global.h. ISAPNP is a opt_dontuse.h, so only filter GEOM_*. Sponsored by: Netflix Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D37108 --- sys/conf/config.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/conf/config.mk b/sys/conf/config.mk index 90e8934d1908..37ab26aae1bd 100644 --- a/sys/conf/config.mk +++ b/sys/conf/config.mk @@ -13,6 +13,13 @@ opt_global.h: @echo "#define SMP 1" >> ${.TARGET} @echo "#define MAC 1" >> ${.TARGET} @echo "#define VIMAGE 1" >> ${.TARGET} +# Note: Define 'options' in DEFAULTS to 1. For simplicity, no check if the +# option is in opt_global.h. Nearly all the options in DEFAUlTS today are in +# opt_global.h with GEOM_* being the main exceptions. Move any options from +# GENERIC or std.* files to DEFAULTS to get this treatment for untied builds. + @awk '$$1 == "options" && $$2 !~ "GEOM_" { print "#define ", $$2, " 1"; }' \ + < ${SYSDIR}/${MACHINE}/conf/DEFAULTS \ + >> ${.TARGET} .if ${MK_BHYVE_SNAPSHOT} != "no" opt_bhyve_snapshot.h: @echo "#define BHYVE_SNAPSHOT 1" > ${.TARGET}