From nobody Thu Mar 09 18:10:32 2023 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 4PXcfw72SVz3xCyV; Thu, 9 Mar 2023 18:10:32 +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 4PXcfw6CVLz4Kkm; Thu, 9 Mar 2023 18:10:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678385432; 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=p1a+moenah/aPmUFiZf2ngBDQKzAVmr6/Ovq8Cwk7bY=; b=VyIOcAWt3312HxZIonK2GuQ6wnMh5BQtL9Nji38bC3q4aRrvWzUDtq3PompHyCp3dbMD4+ 8NnVVLdycOKi6xvHs5C7a6Ke5l2tprlD02fSp4FyVwyk/SI+8I0Zm/WKjir0/eoFD8mWmh vzB/C9enAjUFw6XRb/je7/yKKbKyuNfyfgEvcArAbt4rTXZOwbOk+hFEgWa5MMvDoRPFB3 symFgMv4fmAZRU7Pt/mf5BzsObJFL3gsT8XfJI5GCRLQ5mtynsBPObgQOrPB4ryfxvSvnC 6o+As/MzfPFAOaPes8JdAcS7baW9otzkbpBPJD2vOjRvPCg8VFOuEZWV5oErjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678385432; 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=p1a+moenah/aPmUFiZf2ngBDQKzAVmr6/Ovq8Cwk7bY=; b=RKPK2yMkWnTzCFg1JmZ6D4jbPdUhygd59IGokPI8JFbFBU7mobvlEt2lsgM1qyxiy4keLq 0gVw5EM5Fl16kyxi5yeXYVQ0wzPx2DPkl/Nc/Q0M4rJLpsLHwXNvnfbhXcosU3IWXz54iS s9pChS3hs/sWb6RgHL9ZjBYhS2/CB7X3/NgP5Yqu1Vv/kxpVWiluaKEuYwZcIXxUB5YD7V XOEpt6HOGSDZo/Dpj/0DeL/k8TfHOnXSw3jk6/fYE98/xKvMDQOWbCM5J1mZIDFsXRwv+i VcDLu8fERhGcIteD7p/33KPmGyV467oqgAvZ5FOilIwSsbyPKmKZXEUNbA1SOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678385432; a=rsa-sha256; cv=none; b=pQGNXwSpE5g20OO9uQ6rQ+IpMMZvL3eWfcgNbqclmWaE/HFbLtvVak3qUUJj/goOXeVnxn YFqxIhsqbSL8Uyo5b6iO1PdCObAAoOyqRhsFsSz6CY2hvG/Yw2m5aapyGG/AnNqqvqdGD9 HPJ69INzaNoMbKyZ0qa+6VsWEnaoTKfephhvxk9BBgLJ9If7sSvZ2EZ7iSAXAFyPOkefgv Q2fr4DfmwAy+8fArQ+HP2ut50QCyENyVJZKP8oIwUoBya9apT8TWb6D54GyVcGNn5rXJO/ +tNVSVO4+gItqEPMK7X+E/HgJ3FWkjMpEUXz8IjtgMgIvZpXGLSbNz9mnxWj5Q== 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 4PXcfw5KT9zHnH; Thu, 9 Mar 2023 18:10:32 +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 329IAWEf088514; Thu, 9 Mar 2023 18:10:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 329IAWiS088513; Thu, 9 Mar 2023 18:10:32 GMT (envelope-from git) Date: Thu, 9 Mar 2023 18:10:32 GMT Message-Id: <202303091810.329IAWiS088513@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: aad600e52e8b - main - Remove WITH(OUT)_ATM option 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aad600e52e8b34af3b88de0196c8a6df961c4e40 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=aad600e52e8b34af3b88de0196c8a6df961c4e40 commit aad600e52e8b34af3b88de0196c8a6df961c4e40 Author: Brooks Davis AuthorDate: 2023-03-09 18:04:36 +0000 Commit: Brooks Davis CommitDate: 2023-03-09 18:09:18 +0000 Remove WITH(OUT)_ATM option With the removal of NgATM it no longer controls anything. Reviewed by: manu, emaste Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D38882 --- share/man/man5/src.conf.5 | 6 +----- share/mk/src.opts.mk | 2 -- tools/build/options/WITHOUT_ATM | 3 --- tools/build/options/WITH_ATM | 1 - tools/tools/nanobsd/dhcpd/common | 1 - tools/tools/nanobsd/embedded/common | 1 - 6 files changed, 1 insertion(+), 13 deletions(-) diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 0615afd8dead..a05987e1a492 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd March 8, 2023 +.Dd March 9, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -126,8 +126,6 @@ checks. Do not build .Xr at 1 and related utilities. -.It Va WITH_ATM -Build ATM Libraries and related programs. .It Va WITHOUT_AUDIT Do not build audit support into system programs. .It Va WITHOUT_AUTHPF @@ -1204,8 +1202,6 @@ When set, it enforces these options: .Pp .Bl -item -compact .It -.Va WITHOUT_ATM -.It .Va WITHOUT_BLUETOOTH .El .Pp diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index d8cadd43a88b..7e477a24c61b 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -192,7 +192,6 @@ __DEFAULT_YES_OPTIONS = \ ZONEINFO __DEFAULT_NO_OPTIONS = \ - ATM \ BEARSSL \ BHYVE_SNAPSHOT \ CLANG_EXTRAS \ @@ -405,7 +404,6 @@ MK_DMAGENT:= no .endif .if ${MK_NETGRAPH} == "no" -MK_ATM:= no MK_BLUETOOTH:= no .endif diff --git a/tools/build/options/WITHOUT_ATM b/tools/build/options/WITHOUT_ATM deleted file mode 100644 index 345663fb3ccd..000000000000 --- a/tools/build/options/WITHOUT_ATM +++ /dev/null @@ -1,3 +0,0 @@ -.\" $FreeBSD$ -Do not build -programs and libraries related to ATM networking. diff --git a/tools/build/options/WITH_ATM b/tools/build/options/WITH_ATM deleted file mode 100644 index dcd47b23d63c..000000000000 --- a/tools/build/options/WITH_ATM +++ /dev/null @@ -1 +0,0 @@ -Build ATM Libraries and related programs. diff --git a/tools/tools/nanobsd/dhcpd/common b/tools/tools/nanobsd/dhcpd/common index dbd570d5e3c7..0bfe1993fc13 100644 --- a/tools/tools/nanobsd/dhcpd/common +++ b/tools/tools/nanobsd/dhcpd/common @@ -100,7 +100,6 @@ export NANO_MAKEFS CONF_BUILD=" WITHOUT_ACPI=true -WITHOUT_ATM=true WITHOUT_AUDIT=true WITHOUT_BLUETOOTH=true WITHOUT_CALENDAR=true diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index 37d7421a9a58..ba7ac643820e 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -131,7 +131,6 @@ customize_cmd cust_install_machine_files CONF_BUILD=" LOCAL_XTOOL_DIRS=usr.bin/mkimg WITHOUT_ACPI=true -WITHOUT_ATM=true WITHOUT_AUDIT=true WITHOUT_BLUETOOTH=true WITHOUT_CALENDAR=true