Hi Bruce, On 05/14/2014 05:55 PM, Bruce Richardson wrote: > When running "make config" and additional config.orig file is also > generated, which is intended to hold the original, clean configuration > from the template. > When running make install, we first check if there is no existing > .config file, and run make config if not. If there is a file, we then > check if it's unmodified, in which case we regenerate a new .config to > take account of any possible updates to the template. Finally, in the > case where there is an existing .config file, and it HAS been modified, > we then do a check to see if the template has had further updates, and > throw an error if so. If no updates, we continue with the build using > the existing, user-modified config. > > Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
It looks good to me, except the small typos below. > --- a/mk/rte.sdkinstall.mk > +++ b/mk/rte.sdkinstall.mk > @@ -54,10 +54,20 @@ INSTALL_TARGETS := $(addsuffix _install,\ > .PHONY: install > install: $(INSTALL_TARGETS) > > + > %_install: > @echo ================== Installing $* > $(Q)if [ ! -f $(BUILD_DIR)/$*/.config ]; then \ > $(MAKE) config T=$* O=$(BUILD_DIR)/$*; \ No need to add an extra line here. > + elif cmp -s $(BUILD_DIR)/$*/.config.orig $(BUILD_DIR)/$*/.config; then \ > + $(MAKE) config T=$* O=$(BUILD_DIR)/$*; \ > + else \ > + $(MAKE) config T=$* O=/tmp/$*; \ > + if ! cmp -s /tmp/$*/.config.orig $(BUILD_DIR)/$*/.config.orig > ; then \ > + echo "Config Conflict: Local config and standard config > have both changed" ; \ > + exit 1; \ I would remove extra upper-case chars and say "template" instead of "standard". Like that: echo "Config conflict: local config and template config have both changed" Apart from these minor changes, Acked-by: Olivier Matz <olivier.matz at 6wind.com> Regards, Olivier
