From c8ef8b3b0f1edf36bfce8455fe703d6cf48e4c8d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 24 May 2019 17:51:53 +0100 Subject: layer.conf: Whitelist lttng-tools->lttng-modules dependency The API between lttng-tools and lttng-modules is safe, whitelist it as the dependency fixes tools failures. This needs a hack in the multilib class as right now there is no way to know if a given recipe is a kernel module or not. This needs to be revisited. (From OE-Core rev: 584e713bf7f6885a13c440cd45c0f469feb3a694) Signed-off-by: Richard Purdie --- meta/classes/multilib_global.bbclass | 3 +++ meta/conf/layer.conf | 1 + 2 files changed, 4 insertions(+) (limited to 'meta') diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index 649cc096b7..19ce1a5091 100644 --- a/meta/classes/multilib_global.bbclass +++ b/meta/classes/multilib_global.bbclass @@ -118,6 +118,9 @@ def preferred_ml_updates(d): d.renameVar(prov, provexp) def translate_provide(prefix, prov): + # Really need to know if kernel modules class is inherited somehow + if prov == "lttng-modules": + return prov if not prov.startswith("virtual/"): return prefix + "-" + prov if prov == "virtual/kernel": diff --git a/meta/conf/layer.conf b/meta/conf/layer.conf index 6590e80700..5ecb93651e 100644 --- a/meta/conf/layer.conf +++ b/meta/conf/layer.conf @@ -77,6 +77,7 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \ weston-init->weston \ weston-init->kbd \ connman->xl2tpd \ + lttng-tools->lttng-modules \ " # Avoid adding bison-native to the sysroot without a specific -- cgit v1.2.3-54-g00ecf