Jelajahi Sumber

swupdate: Fix multilib depends

Since oe-core edbf8d3999, anonymous python
must explicitly add MLPREFIX.

Signed-off-by: Michael Gloff <mgloff@hotmail.com>
Michael Gloff 2 tahun lalu
induk
melakukan
8a042553c1
1 mengubah file dengan 19 tambahan dan 4 penghapusan
  1. 19 4
      recipes-support/swupdate/swupdate.inc

+ 19 - 4
recipes-support/swupdate/swupdate.inc

@@ -130,9 +130,10 @@ python () {
     features = features.splitlines(True)
 
 
-    depends = d.getVar('DEPENDS', False)
+    depends = ''
     pn = d.getVar('PN')
-    rdepends = d.getVar("RDEPENDS:%s" % pn) or ""
+    rdepends = ''
+    mlprefix = d.getVar("MLPREFIX") or ""
 
     if 'CONFIG_REMOTE_HANDLER=y\n' in features:
         depends += ' zeromq'
@@ -188,8 +189,22 @@ python () {
     if 'CONFIG_DELTA=y\n' in features:
         depends += ' zchunk'
 
-    d.setVar('DEPENDS', depends)
-    d.setVar("RDEPENDS:%s" % pn, rdepends)
+    if mlprefix:
+        deps = ' '
+        rdeps = ' '
+        for dep in depends.split():
+            dep = mlprefix + dep + ' '
+            deps += dep
+
+        for rdep in rdepends.split():
+            rdep = mlprefix + dep + ' '
+            rdeps += rdep
+
+        depends = deps
+        repends = rdeps
+
+    d.appendVar('DEPENDS', depends)
+    d.appendVar("RDEPENDS:%s" % pn, rdepends)
 
     if 'CONFIG_MONGOOSE=y\n' in features:
         d.setVar('SWUPDATE_MONGOOSE', 'true')