[oe-commits] [openembedded-core] 02/42: package.bbclass: append to FILERPROVIDES_*/FILERDEPENDS_* variables instead of setting them

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 01b9810ff1cea53ae321f6fbe760b83573ed78c0
Author: Martin Jansa <martin.jansa at gmail.com>
AuthorDate: Thu Jul 26 11:09:58 2018 +0000

    package.bbclass: append to FILERPROVIDES_*/FILERDEPENDS_* variables instead of setting them
    
    * this allows to work around some of the issues with file-rdeps
    * e.g. in my case I have /usr/lib/libmali.so.0.1 which according to rpmdeps
      provides only following libmali*
      libmali.so(LIBMALI_1.0)
      libmali.so.0.1
      but many users of this link with libmali.so directly and according to
      rpmdeps require libmali.so which causes file-rdeps for a lot of
      recipes
    * I was using simple work around to just set:
      RPROVIDES_${PN} = "libmali.so libGLESv2.so libEGL.so"
      but that doesn't work well with multilib, because the value gets
      expanded with MLPREFIX and
      RPROVIDES_${PN} = "lib32-libmali.so lib32-libGLESv2.so lib32-libEGL.so"
      doesn't help at all.
    
    [YOCTO #9217] Many unsolveable QA warnings from build-deps and file-rdeps
    
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/package.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 546047c..80233a8 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1557,12 +1557,12 @@ python package_do_filedeps() {
         for file in provides:
             provides_files[pkg].append(file)
             key = "FILERPROVIDES_" + file + "_" + pkg
-            d.setVar(key, " ".join(provides[file]))
+            d.appendVar(key, " " + " ".join(provides[file]))
 
         for file in requires:
             requires_files[pkg].append(file)
             key = "FILERDEPENDS_" + file + "_" + pkg
-            d.setVar(key, " ".join(requires[file]))
+            d.appendVar(key, " " + " ".join(requires[file]))
 
     for pkg in requires_files:
         d.setVar("FILERDEPENDSFLIST_" + pkg, " ".join(requires_files[pkg]))

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.