From: Andreas Oberritter <obi@opendreambox.org>
Date: Fri, 10 May 2019 18:22:17 +0000 (+0200)
Subject: update-alternatives: Remove build-time dependency
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7171bdd22cf9768d76e5eb90dc11186bd3128e17;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

update-alternatives: Remove build-time dependency

Update-alternatives is actually a runtime dependency. The build-time
dependency is only needed to make sure update-alternative gets built
at all, because the runtime dependencies are generated too late for
bitbake to notice.

This breaks a dependency loop between dpkg and xz, if dpkg also
serves as the preferred runtime provider for update-alternatives.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---

diff --git a/meta/classes/update-alternatives.bbclass b/meta/classes/update-alternatives.bbclass
index 8c2b66e7f15..aae3fc65d3d 100644
--- a/meta/classes/update-alternatives.bbclass
+++ b/meta/classes/update-alternatives.bbclass
@@ -87,7 +87,7 @@ def gen_updatealternativesvardeps(d):
 
 def ua_extend_depends(d):
     if not 'virtual/update-alternatives' in d.getVar('PROVIDES'):
-        d.appendVar('DEPENDS', ' virtual/${MLPREFIX}update-alternatives')
+        d.appendVarFlag('do_package', 'depends', ' virtual/${MLPREFIX}update-alternatives:do_populate_sysroot')
 
 def update_alternatives_enabled(d):
     # Update Alternatives only works on target packages...