From nobody Tue Apr 09 17:07:57 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 4VDXTT3V9Rz5HL8t; Tue, 9 Apr 2024 17:07:57 +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 4VDXTT2cgBz4fp4; Tue, 9 Apr 2024 17:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712682477; 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=GAMXWCOKceY0oLeUmZorMBdZAbbHq83RsPv8AA1SL9Q=; b=Nh+XJzbYde4/+XjwC1QZ6eaVvGPrPUR4I+UtRSJIIB/X2QXbMQ5vcJEZxuMT6J3j1nza6q Ka64p6RXDwS5Wyx2Dw4DwQwDAocg1wgzYPjm8l3tK8PjQrYdikrM5iXQzoUBu5Mv756oOm mZbdtlErQgsENvR0yyqyc18QJoTOVrqqpnoJVrE17OhWQUvC0IsXSR8Y2bNyreee/6k59M iEP3qwEGPeJIvaO36P+WOPcRw1HLT5WVXmkvyu4QGh7k6BIUo2P8vmTj4y//5MpRx/mf+u ayX/hrXEWssyFbzwkUEf3Pnu6FiXmOsw2IAfcoti6nShWyfIzYafAx3PQ6e61A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712682477; a=rsa-sha256; cv=none; b=rq2Vmb1SqG+VAhihzsKPh4dcIh2nhYDcOrIVElSL4y0uZpkwaGr0wYtgTgxq0XSRd6m3T3 RciZyWz5ZsRbDRqEXR+C0TXk3OfOzshuaUyOIrievYHoU4GnG+AMwBAzm8NrCkABH1JA62 g2qy6SE201lgllTrZrTnGCo53rFjSzvY/XsFEEAsC9jnN88eMPvzlzgU6xSg8aGfBnpy3E iK0of2nWw7Q1TlvY1CdsbIyUrtsX+nToYmxS6Hu6FnHtuDC2EygNuilexg4T+vU1BN7l57 CwrnpISYFvYx6jHzU238yzpF0gIhJURnE8oMS6JHxkD56Mqe0DBOHgqZ+tKiOw== 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=1712682477; 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=GAMXWCOKceY0oLeUmZorMBdZAbbHq83RsPv8AA1SL9Q=; b=bTrjZ2SuQ35O2a9BpAleNXXh2u9hfIfGB5mRybziZL6VDuaJKUKBTh3Co7apZDoxlEfv5f UHcKOm4mNVKvmgIxYTBA1pGeZfy2tTVW7Civ2HRNXtfDkHjQSah6mzYn0SbacwlFEqbnNF 7PWpqKJ3qcL7Q3BD3OY2aKVSoSNSxbamI2B/xuuK+ovARBTzrD8B8OitHa5HLRSffX99P5 fPxDGOrxBQ+w5yWAZ6hzIxXv2rw0qBufBQycVVczsThbOUdz0Eof+DIwjT71PM0XT0hIce 7gRHxjBQjm+wD/rWpdvpk7TcPd2vlqnLuRN4K+zpO/HaQWCyy77e29fgny+a4Q== 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 4VDXTT2Cs1z13Hk; Tue, 9 Apr 2024 17:07:57 +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 439H7vHK043585; Tue, 9 Apr 2024 17:07:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 439H7vOb043582; Tue, 9 Apr 2024 17:07:57 GMT (envelope-from git) Date: Tue, 9 Apr 2024 17:07:57 GMT Message-Id: <202404091707.439H7vOb043582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 22ca6db50f4e - main - config.mk: Add MK_VIMAGE knob 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: dev-commits-src-all+owner@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: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22ca6db50f4e6bd75a141f57cf953d8de6531a06 Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=22ca6db50f4e6bd75a141f57cf953d8de6531a06 commit 22ca6db50f4e6bd75a141f57cf953d8de6531a06 Author: Stephen J. Kiernan AuthorDate: 2024-04-09 17:04:24 +0000 Commit: Stephen J. Kiernan CommitDate: 2024-04-09 17:05:56 +0000 config.mk: Add MK_VIMAGE knob Default to VIMAGE as yes. Add VIMAGE to __DEFAULT_DEPENDENT_OPTIONS (to define VIMAGE_SUPPORT) Only output VIMAGE to opt_global.h when VIMAGE support is wanted. Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D39636 --- share/mk/src.opts.mk | 2 ++ sys/conf/config.mk | 2 ++ sys/conf/kern.opts.mk | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 99218febf476..a205629fdb2c 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -184,6 +184,7 @@ __DEFAULT_YES_OPTIONS = \ USB \ UTMPX \ VI \ + VIMAGE \ VT \ WIRELESS \ WPA_SUPPLICANT_EAPOL \ @@ -249,6 +250,7 @@ __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 729111b4ef3a..6e26ee0d5e66 100644 --- a/sys/conf/config.mk +++ b/sys/conf/config.mk @@ -11,7 +11,9 @@ 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 d9d96a133250..8b1151f3d624 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -52,6 +52,7 @@ __DEFAULT_YES_OPTIONS = \ SPLIT_KERNEL_DEBUG \ TESTS \ USB_GADGET_EXAMPLES \ + VIMAGE \ ZFS __DEFAULT_NO_OPTIONS = \ @@ -182,7 +183,8 @@ OPT_${opt}:= ${rep} # .for var in \ INET \ - INET6 + INET6 \ + VIMAGE .if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no" MK_${var}_SUPPORT:= no .else