From 3fe1e58de14bf2f8fe30ce001e142c95cf8f4ffa Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Fri, 27 Mar 2015 02:35:11 +0000 Subject: [PATCH] Add support for specifying unsupported / broken options that override any defaults or user specified actions on the command line. This would be useful for specifying features that are always broken or that cannot make sense on a specific architecture, like ACPI on pc98 or EISA on !i386 (!x86 usage of EISA is broken and there's no supported hardware that could have it in any event). Any items in __ALWAYS_NO_OPTIONS are forced to "no" regardless of other settings. Differential Revision: https://reviews.freebsd.org/D2011 --- share/mk/bsd.mkopt.mk | 9 +++++++++ sys/conf/kern.opts.mk | 10 ++++++++++ 2 files changed, 19 insertions(+) diff --git a/share/mk/bsd.mkopt.mk b/share/mk/bsd.mkopt.mk index f0d9add7547..52123d066bf 100644 --- a/share/mk/bsd.mkopt.mk +++ b/share/mk/bsd.mkopt.mk @@ -63,6 +63,15 @@ MK_${var}:= no .endfor .undef __DEFAULT_NO_OPTIONS +# +# MK_* options which are always no, usually because they are +# unsupported/badly broken on this architecture. +# +.for var in ${__ALWAYS_NO_OPTIONS} +MK_${var}:= no +.endfor +.undef __ALWAYS_NO_OPTIONS + # # MK_* options which are always no, usually because they are # unsupported/badly broken on this architecture. diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 02ca4cc71bd..e0f961c378f 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -119,6 +119,16 @@ MK_${var}:= no .undef BROKEN_OPTIONS #end of bsd.mkopt.mk expanded inline. +# +# MK_* options which are always no, usually because they are +# unsupported/badly broken on this architecture. +# +.for var in ${__ALWAYS_NO_OPTIONS} +MK_${var}:= no +.endfor +.undef __ALWAYS_NO_OPTIONS +#end of bsd.mkopt.mk expanded inline. + # # MK_*_SUPPORT options which default to "yes" unless their corresponding # MK_* variable is set to "no".