Przeglądaj źródła

Revert "swupdate: Fix multilib depends"

This reverts commit 3caab8475e27de2cf60a71eea5166e8caf99721f.

Signed-off-by: Stefano Babic <sbabic@denx.de>
Stefano Babic 2 lat temu
rodzic
commit
f96db25fa3
1 zmienionych plików z 4 dodań i 19 usunięć
  1. 4 19
      recipes-support/swupdate/swupdate.inc

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

@@ -130,10 +130,9 @@ python () {
     features = features.splitlines(True)
 
 
-    depends = ''
+    depends = d.getVar('DEPENDS', False)
     pn = d.getVar('PN')
-    rdepends = ''
-    mlprefix = d.getVar("MLPREFIX") or ""
+    rdepends = d.getVar("RDEPENDS:%s" % pn) or ""
 
     if 'CONFIG_REMOTE_HANDLER=y\n' in features:
         depends += ' zeromq'
@@ -189,22 +188,8 @@ python () {
     if 'CONFIG_DELTA=y\n' in features:
         depends += ' zchunk'
 
-    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)
+    d.setVar('DEPENDS', depends)
+    d.setVar("RDEPENDS:%s" % pn, rdepends)
 
     if 'CONFIG_MONGOOSE=y\n' in features:
         d.setVar('SWUPDATE_MONGOOSE', 'true')