D39636.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D39636.diff
View Options

	diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
	--- a/share/mk/src.opts.mk
	+++ b/share/mk/src.opts.mk
	@@ -184,6 +184,7 @@
	USB \
	UTMPX \
	VI \
	+ VIMAGE \
	VT \
	WIRELESS \
	WPA_SUPPLICANT_EAPOL \
	@@ -249,6 +250,7 @@
	NETGRAPH \
	PAM \
	TESTS \
	+ VIMAGE \
	WIRELESS
	__DEFAULT_DEPENDENT_OPTIONS+= ${var}_SUPPORT/${var}
	.endfor
	diff --git a/sys/conf/config.mk b/sys/conf/config.mk
	--- a/sys/conf/config.mk
	+++ b/sys/conf/config.mk
	@@ -11,7 +11,9 @@
	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
	--- a/sys/conf/kern.opts.mk
	+++ b/sys/conf/kern.opts.mk
	@@ -52,6 +52,7 @@
	SPLIT_KERNEL_DEBUG \
	TESTS \
	USB_GADGET_EXAMPLES \
	+ VIMAGE \
	ZFS

	__DEFAULT_NO_OPTIONS = \
	@@ -182,7 +183,8 @@
	#
	.for var in \
	INET \
	- INET6
	+ INET6 \
	+ VIMAGE
	.if defined(WITHOUT_${var}_SUPPORT) \|\| ${MK_${var}} == "no"
	MK_${var}_SUPPORT:= no
	.else