[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCHv6] 03/28] build: use generated Kconfig options for Xen
On 11/30/15 8:45 AM, Jan Beulich wrote: >>>> On 24.11.15 at 18:51, <cardoe@xxxxxxxxxx> wrote: >> --- a/xen/Makefile >> +++ b/xen/Makefile >> @@ -26,6 +26,9 @@ default: build >> .PHONY: dist >> dist: install >> >> +.PHONY: build >> +build:: $(BASEDIR)/include/config/auto.conf >> + >> .PHONY: build install uninstall clean distclean cscope TAGS tags MAP gtags > > I do not see why you need to add build to PHONY's dependencies > another time. > >> @@ -227,9 +230,14 @@ kconfig := silentoldconfig oldconfig config menuconfig >> defconfig \ >> $(kconfig): >> $(MAKE) -f $(BASEDIR)/scripts/kconfig/Makefile ARCH=$(XEN_TARGET_ARCH) >> $@ >> >> -$(BASEDIR)/include/config/%.conf: $(BASEDIR)/include/config/auto.conf.cmd >> +$(BASEDIR)/include/config/%.conf: $(BASEDIR)/include/config/auto.conf.cmd >> $(BASEDIR)/.config >> $(Q)$(MAKE) -f $(BASEDIR)/scripts/kconfig/Makefile >> ARCH=$(XEN_TARGET_ARCH) silentoldconfig >> >> # Allow people to just run `make` as before and not force them to configure >> -$(BASEDIR)/.config $(BASEDIR)/include/config/auto.conf.cmd: ; >> +$(BASEDIR)/.config: >> $(Q)$(MAKE) -f $(BASEDIR)/scripts/kconfig/Makefile >> ARCH=$(XEN_TARGET_ARCH) defconfig > > This should be one of the oldconfig targets now, shouldn't it? oldconfig uses .config. This is the case when the user has checked out the tree fresh. Its there to not change the workflow of "git clone ... && cd xen/xen && make" > >> +# Break the dependency chain for the first run >> +$(BASEDIR)/include/config/auto.conf.cmd: ; >> + >> +-include $(BASEDIR)/include/config/auto.conf.cmd > > The comment is quite a bit different in Linux, and seems to make more > sense. Also note how Linux has an empty rule for $(KCONFIG_CONFIG), > a variable which iirc you defined in an earlier patch and hence perhaps > you should be using here. I don't see where that's defined. > >> --- a/xen/include/xen/config.h >> +++ b/xen/include/xen/config.h >> @@ -12,6 +12,8 @@ >> #endif >> #include <asm/config.h> >> >> +#include <generated/autoconf.h> > > First thing perhaps? > > Jan > Done. -- Doug Goldstein Attachment:
signature.asc _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |