[Buildroot] [PATCH 09/16 v3] core: get rid of our dummy br2-external tree

[Yann E. MORIN <yann.morin.1998@free.fr>]

Romain, All,

On 2016-08-06 17:30 +0200, Romain Naour spake thusly:
> Le 17/07/2016 ? 12:34, Yann E. MORIN a ?crit :
> > Now that we generate a kconfig snippet, we can conditionally include the
> > BR2_EXTERNAL's Config.in only when BR2_EXTERNAL is supplied by the user,
> > which means our empty/dummy Config.in is no longer useful to us.
> > 
> > As for external.mk, we can also include it only when BR2_EXTERNAL is
> > supplied by the user, which means our empty/dummy external.mk is no
> > longer of any use to us.
> > 
> > Ditch both of those files, and:
> > 
> >   - only generate actual content in the Kconfig snippet when we actually
> >     do have a BR2_EXTERNAL provided by the user (i.e. BR2_EXTERNAL is not
> >     empty);
> > 
> >   - add a variable that contains the path to the external.mk provided by
> >     the user, or empty if none, and include the path set in that variable
> >     (make can 'include' nothing without any problem! ;-) )
> 
> Maybe a dumb question but it's true with old make version (i.e 3.81) ?

As discussed on IRC: yes, make-3.81 does not whine.

> Otherwise:
> Reviewed-by: Romain Naour <romain.naour@gmail.com>

Thanks!

I'll wait for your complete review of the series before replying to the
other comments (hwen needed), then I'll fix the series.

Thanks! :-)

Regards,
Yann E. MORIN.

> Best regards,
> Romain
> 
> > 
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > Cc: Peter Korsgaard <jacmet@uclibc.org>
> > Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com>
> > Cc: Arnout Vandecappelle <arnout@mind.be>
> > ---
> >  Makefile                           | 18 +++++++-----------
> >  support/dummy-external/Config.in   |  0
> >  support/dummy-external/external.mk |  0
> >  3 files changed, 7 insertions(+), 11 deletions(-)
> >  delete mode 100644 support/dummy-external/Config.in
> >  delete mode 100644 support/dummy-external/external.mk
> > 
> > diff --git a/Makefile b/Makefile
> > index 86c532e..be2f586 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -147,16 +147,11 @@ $(if $(BASE_DIR),, $(error output directory "$(O)" does not exist))
> >  # on the command line, therefore the file is re-created every time make is run.
> >  #
> >  # When BR2_EXTERNAL is set to an empty value (e.g. explicitly in command
> > -# line), the .br-external file is removed and we point to
> > -# support/dummy-external. This makes sure we can unconditionally include the
> > -# Config.in and external.mk from the BR2_EXTERNAL directory. In this case,
> > -# override is necessary so the user can clear BR2_EXTERNAL from the command
> > -# line, but the dummy path is still used internally.
> > +# line), the .br-external file is removed.
> >  
> >  BR2_EXTERNAL_FILE = $(BASE_DIR)/.br-external
> >  -include $(BR2_EXTERNAL_FILE)
> >  ifeq ($(BR2_EXTERNAL),)
> > -  override BR2_EXTERNAL = support/dummy-external
> >    $(shell rm -f $(BR2_EXTERNAL_FILE))
> >  else
> >    _BR2_EXTERNAL = $(shell cd $(BR2_EXTERNAL) >/dev/null 2>&1 && pwd)
> > @@ -165,6 +160,7 @@ else
> >    endif
> >    override BR2_EXTERNAL := $(_BR2_EXTERNAL)
> >    $(shell echo BR2_EXTERNAL ?= $(BR2_EXTERNAL) > $(BR2_EXTERNAL_FILE))
> > +  BR2_EXTERNAL_MK = $(BR2_EXTERNAL)/external.mk
> >  endif
> >  
> >  # To make sure that the environment variable overrides the .config option,
> > @@ -461,7 +457,8 @@ include boot/common.mk
> >  include linux/linux.mk
> >  include fs/common.mk
> >  
> > -include $(BR2_EXTERNAL)/external.mk
> > +# Nothing to include if no BR2_EXTERNAL tree in use
> > +include $(BR2_EXTERNAL_MK)
> >  
> >  # Now we are sure we have all the packages scanned and defined. We now
> >  # check for each package in the list of enabled packages, that all its
> > @@ -882,13 +879,12 @@ endif
> >  
> >  .PHONY: $(BUILD_DIR)/.br2-external.in
> >  $(BUILD_DIR)/.br2-external.in: $(BUILD_DIR)
> > -	$(Q)( \
> > +	$(Q)if [ -n '$(BR2_EXTERNAL)' ]; then \
> >  		printf "#\n# Automatically generated file; DO NOT EDIT.\n#\n\n"; \
> > -		printf 'menu "User-provided options"\n'; \
> > -		printf '\tdepends on BR2_EXTERNAL != "support/dummy-external"\n\n'; \
> > +		printf 'menu "User-provided options"\n\n'; \
> >  		printf 'source "%s/Config.in"\n\n' $$(cd $(BR2_EXTERNAL) >/dev/null 2>&1 && pwd); \
> >  		printf 'endmenu # User-provided options\n'; \
> > -	) >$@
> > +	fi >$@
> >  
> >  # printvars prints all the variables currently defined in our
> >  # Makefiles. Alternatively, if a non-empty VARS variable is passed,
> > diff --git a/support/dummy-external/Config.in b/support/dummy-external/Config.in
> > deleted file mode 100644
> > index e69de29..0000000
> > diff --git a/support/dummy-external/external.mk b/support/dummy-external/external.mk
> > deleted file mode 100644
> > index e69de29..0000000
> > 
> 

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'