Message ID | 1462162246-32413-6-git-send-email-cardoe@cardoe.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Sun, May 01, 2016 at 11:10:44PM -0500, Doug Goldstein wrote: > This allows 'make debug=n' and 'make debug=y' work as it did previously > but only in the case of the user not having an existing .config file > from a 'make menuconfig'. This is because the command line 'debug' flag > can only be used to set the default value and if the user has already > built up a config their have their real preference set. s/their have their/with their/ ? Thank you for making this work. > > Signed-off-by: Doug Goldstein <cardoe@cardoe.com> > --- > CC: Andrew Cooper <andrew.cooper3@citrix.com> > CC: George Dunlap <George.Dunlap@eu.citrix.com> > CC: Ian Jackson <ian.jackson@eu.citrix.com> > CC: Jan Beulich <jbeulich@suse.com> > CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > CC: Stefano Stabellini <sstabellini@kernel.org> > CC: Tim Deegan <tim@xen.org> > CC: Wei Liu <wei.liu2@citrix.com> > --- > xen/Kconfig.debug | 5 +++++ > xen/Makefile | 1 + > 2 files changed, 6 insertions(+) > > diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug > index 0b2ec50..ec27b09 100644 > --- a/xen/Kconfig.debug > +++ b/xen/Kconfig.debug > @@ -1,6 +1,11 @@ > +config DEBUG_ENV > + bool > + option env="debug" > > menuconfig DEBUG > bool "Debugging Options" > + default y if DEBUG_ENV = "y" > + default n > ---help--- > If you want to debug Xen say Y and select any additional debugging > support options. This enables additional debugging through Xen > diff --git a/xen/Makefile b/xen/Makefile > index f49014b..e2da895 100644 > --- a/xen/Makefile > +++ b/xen/Makefile > @@ -27,6 +27,7 @@ SRCARCH=$(shell echo $(ARCH) | sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g') > # Don't break if the build process wasn't called from the top level > # we need XEN_TARGET_ARCH to generate the proper config > include $(XEN_ROOT)/Config.mk > +export debug > > # Allow someone to change their config file > export KCONFIG_CONFIG ?= .config > -- > 2.7.3 >
diff --git a/xen/Kconfig.debug b/xen/Kconfig.debug index 0b2ec50..ec27b09 100644 --- a/xen/Kconfig.debug +++ b/xen/Kconfig.debug @@ -1,6 +1,11 @@ +config DEBUG_ENV + bool + option env="debug" menuconfig DEBUG bool "Debugging Options" + default y if DEBUG_ENV = "y" + default n ---help--- If you want to debug Xen say Y and select any additional debugging support options. This enables additional debugging through Xen diff --git a/xen/Makefile b/xen/Makefile index f49014b..e2da895 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -27,6 +27,7 @@ SRCARCH=$(shell echo $(ARCH) | sed -e 's/x86.*/x86/' -e s'/arm\(32\|64\)/arm/g') # Don't break if the build process wasn't called from the top level # we need XEN_TARGET_ARCH to generate the proper config include $(XEN_ROOT)/Config.mk +export debug # Allow someone to change their config file export KCONFIG_CONFIG ?= .config
This allows 'make debug=n' and 'make debug=y' work as it did previously but only in the case of the user not having an existing .config file from a 'make menuconfig'. This is because the command line 'debug' flag can only be used to set the default value and if the user has already built up a config their have their real preference set. Signed-off-by: Doug Goldstein <cardoe@cardoe.com> --- CC: Andrew Cooper <andrew.cooper3@citrix.com> CC: George Dunlap <George.Dunlap@eu.citrix.com> CC: Ian Jackson <ian.jackson@eu.citrix.com> CC: Jan Beulich <jbeulich@suse.com> CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> CC: Stefano Stabellini <sstabellini@kernel.org> CC: Tim Deegan <tim@xen.org> CC: Wei Liu <wei.liu2@citrix.com> --- xen/Kconfig.debug | 5 +++++ xen/Makefile | 1 + 2 files changed, 6 insertions(+)