diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-24 17:51:53 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-27 17:06:34 +0100 |
commit | c8ef8b3b0f1edf36bfce8455fe703d6cf48e4c8d (patch) | |
tree | b5f67ccee894a9d8c9bc92c51ca6c668dc216b2c /meta | |
parent | 85d283c960c938ff76e4cdcad784afcba2e6dd30 (diff) | |
download | poky-c8ef8b3b0f1edf36bfce8455fe703d6cf48e4c8d.tar.gz |
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/multilib_global.bbclass | 3 | ||||
-rw-r--r-- | meta/conf/layer.conf | 1 |
2 files changed, 4 insertions, 0 deletions
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): | |||
118 | d.renameVar(prov, provexp) | 118 | d.renameVar(prov, provexp) |
119 | 119 | ||
120 | def translate_provide(prefix, prov): | 120 | def translate_provide(prefix, prov): |
121 | # Really need to know if kernel modules class is inherited somehow | ||
122 | if prov == "lttng-modules": | ||
123 | return prov | ||
121 | if not prov.startswith("virtual/"): | 124 | if not prov.startswith("virtual/"): |
122 | return prefix + "-" + prov | 125 | return prefix + "-" + prov |
123 | if prov == "virtual/kernel": | 126 | 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 += " \ | |||
77 | weston-init->weston \ | 77 | weston-init->weston \ |
78 | weston-init->kbd \ | 78 | weston-init->kbd \ |
79 | connman->xl2tpd \ | 79 | connman->xl2tpd \ |
80 | lttng-tools->lttng-modules \ | ||
80 | " | 81 | " |
81 | 82 | ||
82 | # Avoid adding bison-native to the sysroot without a specific | 83 | # Avoid adding bison-native to the sysroot without a specific |