From 3117530f4463ae056a5772eaf7b3f1a7fbb31011 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Tue, 13 Sep 2011 19:52:44 +0800 Subject: base.bbclass: do not expand PREFERRED_PROVIDER for kernel recipe With Richard's commit f9c36392, we only build one kernel for a system, thus we shouldn't extend PREFERRED_PROVIDER for virtual/kernel. [YOCTO #1471] (From OE-Core rev: 90ad70fe13a9f8409387ca70289998bdca649aeb) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 104bec8628..4ca04e235f 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -181,8 +181,10 @@ def preferred_ml_updates(d): virt = "virtual/" for p in prefixes: newname = "PREFERRED_PROVIDER_" + virt + p + "-" + pkg + if pkg != "kernel": + val = p + "-" + val if not d.getVar(newname, False): - d.setVar(newname, p + "-" + val) + d.setVar(newname, val) mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split() -- cgit v1.2.3-54-g00ecf