summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2015-12-30 00:10:40 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-12-30 10:01:30 +0100
commitf674c428c2ef76f6486eae10facfb702f8be7244 (patch)
treeb8a309d222b66a2e8b22fc5b4b990a5c79431bf4
parente84fd04e88bcda2771847958b3b5153e476db45f (diff)
downloadbuildroot-f674c428c2ef76f6486eae10facfb702f8be7244.tar.gz
buildroot-f674c428c2ef76f6486eae10facfb702f8be7244.zip
core/pkg-virtual: do not check they are neabled
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 ... [Thomas: - use "$($(PKG)_IS_VIRTUAL)" != "YES" instead of ! "$($(PKG)_IS_VIRTUAL)" = "YES"] Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/pkg-generic.mk5
-rw-r--r--package/pkg-virtual.mk2
2 files changed, 6 insertions, 1 deletions
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 2daf33780a..9e884235b0 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 9c68b511c4..244c1d0420 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 =
OpenPOWER on IntegriCloud