Patchwork chrpath.bbclass: Ensure we only process tmpdir in paths which actually contain that path

login
register
mail settings
Submitter Richard Purdie
Date Aug. 17, 2012, 4:41 p.m.
Message ID <1345221673.27428.16.camel@ted>
Download mbox | patch
Permalink /patch/34837/
State Accepted
Commit 73e2c12534856f14c1a94fb51874e9ba1655f07b
Headers show

Comments

Richard Purdie - Aug. 17, 2012, 4:41 p.m.
Without this change, a path to "/lib/xxx" or "/usr/lib/xxx" would also
attempt to be remapped to be relative to $ORIGIN which makes no sense.

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

Patch

diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass
index 8922248..659db31 100644
--- a/meta/classes/chrpath.bbclass
+++ b/meta/classes/chrpath.bbclass
@@ -60,10 +60,12 @@  def process_dir (directory, d):
                 # NOTE: This will not work reliably for cross packages, particularly in the case
                 # where your TMPDIR is a short path (i.e. /usr/poky) as chrpath cannot insert an
                 # rpath longer than that which is already set.
-                else:
+                elif rpath.find(tmpdir) != -1:
                     depth = fpath.rpartition(tmpdir)[2].count('/')
                     libpath = rpath.partition(tmpdir)[2].strip()
-
+                else:
+                    new_rpaths.append(rpath.strip())
+                    continue
                 base = "$ORIGIN"
                 while depth > 1:
                     base += "/.."