Patchwork package.bbclass: Fix shlibs cross package-arch contamination

login
register
mail settings
Submitter Richard Purdie
Date Jan. 19, 2013, 11:47 p.m.
Message ID <1358639222.14265.3.camel@ted>
Download mbox | patch
Permalink /patch/42951/
State Accepted
Commit eabd8606f90e963198c71ce371eb4b23fbb54551
Headers show

Comments

Richard Purdie - Jan. 19, 2013, 11:47 p.m.
I found that if I had two packages architectures built (say core2 and i586),
that the shlibs data from i586 was being used in the core2 build. This
lead to odd dependency issues if the i586 build was out of date and core2
was being targetted.

When loading shlibs files, the last loaded wins so we need to iterate the
lists from least to strongest weighting, not the other way around. With this
patch applied, the contamination issue is resolved.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index b06cca5..66bf4ba 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1521,7 +1521,8 @@  python package_do_shlibs() {
             d.setVar('pkg_postinst_%s' % pkg, postinst)
 
     list_re = re.compile('^(.*)\.list$')
-    for dir in shlibs_dirs:
+    # Go from least to most specific since the last one found wins
+    for dir in reversed(shlibs_dirs):
         if not os.path.exists(dir):
             continue
         for file in os.listdir(dir):
@@ -1643,7 +1644,8 @@  python package_do_pkgconfig () {
                 f.write('%s\n' % p)
             f.close()
 
-    for dir in shlibs_dirs:
+    # Go from least to most specific since the last one found wins
+    for dir in reversed(shlibs_dirs):
         if not os.path.exists(dir):
             continue
         for file in os.listdir(dir):