| Message ID | 7048b92dbba0ba35f610d7863f0c599eca3e3399.1451430505.git.yann.morin.1998@free.fr |
|---|---|
| State | Accepted |
| Headers | show |
Dear Yann E. MORIN, On Wed, 30 Dec 2015 00:10:40 +0100, Yann E. MORIN wrote: > ifeq ($(MAKECMDGOALS),) > - @if test "$($(PKG)_TYPE)" = "target" -a -z "$($($(PKG)_KCONFIG_VAR))" ; then \ > + @if test "$($(PKG)_TYPE)" = "target" \ > + -a ! "$($(PKG)_IS_VIRTUAL)" = "YES" \ I changed this to: -a "$($(PKG)_IS_VIRTUAL)" != "YES" \ which I believe is a bit more logical. > diff --git a/package/pkg-virtual.mk b/package/pkg-virtual.mk > index 9c68b51..244c1d0 100644 > --- a/package/pkg-virtual.mk > +++ b/package/pkg-virtual.mk > @@ -41,6 +41,8 @@ $$(error No implementation selected for virtual package $(1). Configuration erro > endif > endif > > +$(2)_IS_VIRTUAL = YES I wasn't sure whether a new variable was needed. We could have used $($(PKG)_VERSION) != "virtual", but that would have failed if one day we have a normal package that really has a version named "virtual" for some reason. We can anyway change this later on if others have better suggestions. Thanks, Thomas
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 2daf337..08f9703 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -186,7 +186,10 @@ $(BUILD_DIR)/%/.stamp_configured: # building a package, even if not enabled in the configuration, we # want to accept it. ifeq ($(MAKECMDGOALS),) - @if test "$($(PKG)_TYPE)" = "target" -a -z "$($($(PKG)_KCONFIG_VAR))" ; then \ + @if test "$($(PKG)_TYPE)" = "target" \ + -a ! "$($(PKG)_IS_VIRTUAL)" = "YES" \ + -a -z "$($($(PKG)_KCONFIG_VAR))" ; \ + then \ echo "ERROR: $($(PKG)_NAME) is in the dependency chain of a package that has" ; \ echo "added it to its _DEPENDENCIES variable (directly or indirectly)" ; \ echo "without selecting it from Config.in." ; \ diff --git a/package/pkg-virtual.mk b/package/pkg-virtual.mk index 9c68b51..244c1d0 100644 --- a/package/pkg-virtual.mk +++ b/package/pkg-virtual.mk @@ -41,6 +41,8 @@ $$(error No implementation selected for virtual package $(1). Configuration erro endif endif +$(2)_IS_VIRTUAL = YES + # A virtual package does not have any source associated $(2)_SOURCE =
Virtual packages do not have a Kconfig symbol, so we must not check that they are enabled. Fixes: http://autobuild.buildroot.org/results/287/28713478cc6edf8e5d5c3e830fee86a42f0afa8d/ ... and numerous similar failures ... Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- package/pkg-generic.mk | 5 ++++- package/pkg-virtual.mk | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-)