From 59e15f671222077db57d394b1f022549fa3509ff Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 18 Jan 2013 17:13:38 -0600 Subject: update-alternatives: Add a build-time dependency We need to add a build time dependency on virtual/update-alternatives, however we can't just do DEPENDS +=, or we end up with various problems. To work around this, in the anonymous python space we ensure we only do the addition when the package does not provide virtual/update-alternatives and it is a target package. Also the system wide PREFERRED_PROVIDER was incorrect. It references a runtime package, and not the recipe it should have. This has been corrected. [YOCTO #3691] (From OE-Core rev: 56a59ef12936dcc6464cf1d43dda6957a5aa8c65) Signed-off-by: Mark Hatle Tested-by: Khem Raj Signed-off-by: Richard Purdie --- meta/classes/update-alternatives.bbclass | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'meta/classes/update-alternatives.bbclass') diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass index 556ee7cbae..a75e282a3c 100644 --- a/meta/classes/update-alternatives.bbclass +++ b/meta/classes/update-alternatives.bbclass @@ -167,12 +167,25 @@ def gen_updatealternativesvardeps(d): continue d.appendVar('%s_VARDEPS_%s' % (v,p), ' %s:%s' % (flag, d.getVarFlag('%s_%s' % (v,p), flag, False))) +def ua_extend_depends(d): + if not 'virtual/update-alternatives' in d.getVar('PROVIDES', True): + d.appendVar('DEPENDS', ' virtual/update-alternatives') + python __anonymous() { + # Update Alternatives only works on target packages... + if bb.data.inherits_class('native', d) or bb.data.inherits_class('nativesdk', d) or \ + bb.data.inherits_class('cross', d) or bb.data.inherits_class('crosssdk', d) or \ + bb.data.inherits_class('cross-canadian', d): + return + # deprecated stuff... update_alternatives_after_parse(d) # compute special vardeps gen_updatealternativesvardeps(d) + + # extend the depends to include virtual/update-alternatives + ua_extend_depends(d) } def gen_updatealternativesvars(d): -- cgit 1.2.3-korg