mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-11-24 07:40:52 +00:00
Code Issues Releases Activity

config.mk: Add MK_VIMAGE knob

Browse Source 
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
This commit is contained in:
Stephen J. Kiernan 2024-04-09 13:04:24 -04:00
parent 841cf52595
commit 22ca6db50f
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/mk/src.opts.mk
View File

@ -184,6 +184,7 @@ __DEFAULT_YES_OPTIONS = \
USB \ USB \
UTMPX \ UTMPX \
VI \ VI \
VIMAGE \
VT \ VT \
WIRELESS \ WIRELESS \
WPA_SUPPLICANT_EAPOL \ WPA_SUPPLICANT_EAPOL \
@ -249,6 +250,7 @@ __LIBC_MALLOC_DEFAULT= jemalloc
NETGRAPH \ NETGRAPH \
PAM \ PAM \
TESTS \ TESTS \
VIMAGE \
WIRELESS WIRELESS
__DEFAULT_DEPENDENT_OPTIONS+= ${var}_SUPPORT/${var} __DEFAULT_DEPENDENT_OPTIONS+= ${var}_SUPPORT/${var}
.endfor .endfor

2
sys/conf/config.mk
View File

@ -11,7 +11,9 @@ opt_global.h:
touch ${.TARGET} touch ${.TARGET}
@echo "#define SMP 1" >> ${.TARGET} @echo "#define SMP 1" >> ${.TARGET}
@echo "#define MAC 1" >> ${.TARGET} @echo "#define MAC 1" >> ${.TARGET}
.if ${MK_VIMAGE_SUPPORT} != "no"
@echo "#define VIMAGE 1" >> ${.TARGET} @echo "#define VIMAGE 1" >> ${.TARGET}
.endif
# Note: Define 'options' in DEFAULTS to 1. For simplicity, no check if the # 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 # 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 # opt_global.h with GEOM_* being the main exceptions. Move any options from

4
sys/conf/kern.opts.mk
View File

@ -52,6 +52,7 @@ __DEFAULT_YES_OPTIONS = \
SPLIT_KERNEL_DEBUG \ SPLIT_KERNEL_DEBUG \
TESTS \ TESTS \
USB_GADGET_EXAMPLES \ USB_GADGET_EXAMPLES \
VIMAGE \
ZFS ZFS
__DEFAULT_NO_OPTIONS = \ __DEFAULT_NO_OPTIONS = \
@ -182,7 +183,8 @@ OPT_${opt}:= ${rep}
# #
.for var in \ .for var in \
INET \ INET \
INET6 INET6 \
VIMAGE
.if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no" .if defined(WITHOUT_${var}_SUPPORT) || ${MK_${var}} == "no"
MK_${var}_SUPPORT:= no MK_${var}_SUPPORT:= no
.else .else