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 22ca6db50f.
This commit is contained in:
@@ -183,7 +183,6 @@ __DEFAULT_YES_OPTIONS = \
|
|||||||
USB \
|
USB \
|
||||||
UTMPX \
|
UTMPX \
|
||||||
VI \
|
VI \
|
||||||
VIMAGE \
|
|
||||||
VT \
|
VT \
|
||||||
WIRELESS \
|
WIRELESS \
|
||||||
WPA_SUPPLICANT_EAPOL \
|
WPA_SUPPLICANT_EAPOL \
|
||||||
@@ -248,7 +247,6 @@ __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
|
||||||
|
|||||||
@@ -11,9 +11,7 @@ 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
|
||||||
|
|||||||
@@ -52,7 +52,6 @@ __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 = \
|
||||||
@@ -183,8 +182,7 @@ 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
|
||||||
|
|||||||
Reference in New Issue
Block a user