From nobody Thu Apr 25 21:43:45 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 4VQTrK2h32z5JcVC; Thu, 25 Apr 2024 21:43: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 4VQTrK25Lrz41qY; Thu, 25 Apr 2024 21:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714081425; 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=DzNk5oUWqhgCBtxs+2QpTp+dS4tIOsyEKdC0nFYR+VA=; b=hjm29Fw6fuTGDMcjdmMO8UFBH2JZtb+mWL/2YDt2lThKHSlv7/SCM6mFp34s253noJuVkf M9lBZsWd9xx6QAIhVsTIwGpNrgkowwKSiUZqfcyeUbWTNTdFmb02XRIT1Q3dauoLWftOVC +eSAFsGWJMbbmhPyXX77VrCYpAuj/UOmPxjqZUH5EfZor96xSmJ7lficcRVMUz163OBjEN fvgL+rHNzlYx2AqBfrdWiHUsWytnbzo7DfRIJMnPekgK4useUmVF2ZbdrU9qSC01K2u+3M ICSZGtlrXhcIK0tOo2OMQV7drzdLiIbG/l/J/Bwh9xz6DVM6GJ5XsOqhDq2G0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714081425; a=rsa-sha256; cv=none; b=lAjZHWTOLRyiARBqS7cngwuwzg3eGTfyDQSSgzo2R64y9WBpKEuB+TlasNbfRIcWHRzUdR LTJ9FznVL6UrEzS3puJoMRynecRo1ONFhbiL7HebLdw8ajB5yd3jbCb+BTu80nYJ5uNg2E wreJzh9/eJGYS+SSHmWdjC3gIBq5YpaM8oPQGXxMVUFs/0bp8+7Au1du9kDfqC9bpptMY3 cE9CzZ+/mPidPxq/Yg4qWP7IUYz0hZWLe0XNkB0jPtqs0rVbIbFpZd6Qj5hhTmbwbD8IyA W8ddGKELq/G/9kW43ELP8TSEsf1tVIir81Ia1X1qhk3EUGLx/yPdC+H9IlvMhQ== 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=1714081425; 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=DzNk5oUWqhgCBtxs+2QpTp+dS4tIOsyEKdC0nFYR+VA=; b=aDlhIJV3J53xafDveR9zWcDRwdZ1hEbg14APFcpfBGfsGszfpLC1532T1ziBpmciASjH/O VKL5NxP9giV1L9hkHjZCaBU/qr9RUDZ2EnZOf1bfsKoxHD759OgoeI+uY5n8HmenmRTtHo y5XEr+O7Gzyxn/IZBa7GKDq4C9SfgnD6OEsbZoV25j6xGsWxMZGPiw1us8v4mven43aPmX kgXZBlwunraPM45yMCPyZ4p0ynublkKTeDuIjzd/zjSkCV/x9+KGIALoiTyswZPMhVesc+ fOmXqdujfzDVx5Rw0uNzD1g3MG6+lbOWBB8GlihKEgCxdaTeRLfPPBtgwWO9Mw== 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 4VQTrK1hb1zGWM; Thu, 25 Apr 2024 21:43:45 +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 43PLhj8s052106; Thu, 25 Apr 2024 21:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PLhjjm052103; Thu, 25 Apr 2024 21:43:45 GMT (envelope-from git) Date: Thu, 25 Apr 2024 21:43:45 GMT Message-Id: <202404252143.43PLhjjm052103@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: 68cbb072fd1c - main - Revert "config.mk: Add MK_VIMAGE knob" 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 68cbb072fd1c7f0928efbb466f278e6c2e0a2024 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=68cbb072fd1c7f0928efbb466f278e6c2e0a2024 commit 68cbb072fd1c7f0928efbb466f278e6c2e0a2024 Author: Brooks Davis AuthorDate: 2024-04-25 21:38:15 +0000 Commit: Brooks Davis CommitDate: 2024-04-25 21:43:36 +0000 Revert "config.mk: Add MK_VIMAGE knob" This commit broke "make makeman" checks in github CI due to a lack of option description files. The split between VIMAGE and VIMAGE_SUPPORT is not clearly justified and the code is broken because there is no opt_vimage.h (it's in opt_global.h). This reverts commit 22ca6db50f4e6bd75a141f57cf953d8de6531a06. --- share/mk/src.opts.mk | 2 -- sys/conf/config.mk | 2 -- sys/conf/kern.opts.mk | 4 +--- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index b7196b6fe824..00405e3f934f 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -183,7 +183,6 @@ __DEFAULT_YES_OPTIONS = \ USB \ UTMPX \ VI \ - VIMAGE \ VT \ WIRELESS \ WPA_SUPPLICANT_EAPOL \ @@ -248,7 +247,6 @@ __LIBC_MALLOC_DEFAULT= jemalloc NETGRAPH \ PAM \ TESTS \ - VIMAGE \ WIRELESS __DEFAULT_DEPENDENT_OPTIONS+= ${var}_SUPPORT/${var} .endfor diff --git a/sys/conf/config.mk b/sys/conf/config.mk index 6e26ee0d5e66..729111b4ef3a 100644 --- a/sys/conf/config.mk +++ b/sys/conf/config.mk @@ -11,9 +11,7 @@ opt_global.h: touch ${.TARGET} @echo "#define SMP 1" >> ${.TARGET} @echo "#define MAC 1" >> ${.TARGET} -.if ${MK_VIMAGE_SUPPORT} != "no" @echo "#define VIMAGE 1" >> ${.TARGET} -.endif # 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 diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 8b1151f3d624..d9d96a133250 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -52,7 +52,6 @@ __DEFAULT_YES_OPTIONS = \ SPLIT_KERNEL_DEBUG \ TESTS \ USB_GADGET_EXAMPLES \ - VIMAGE \ ZFS __DEFAULT_NO_OPTIONS = \ @@ -183,8 +182,7 @@ OPT_${opt}:= ${rep} # .for var in \ INET \ - INET6 \ - VIMAGE + INET6 .if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no" MK_${var}_SUPPORT:= no .else