[OE-core] [PATCH] chrpath.bbclass: Ensure we only process tmpdir in paths which actually contain that path
Richard Purdie
richard.purdie at linuxfoundation.org
Fri Aug 17 16:41:13 UTC 2012
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 at linuxfoundation.org>
---
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 += "/.."
More information about the Openembedded-core
mailing list