[oe-commits] org.oe.dev insane.bbclass: Broaden check for RPATHs by removing work/ path component.

[likewise commit]

insane.bbclass: Broaden check for RPATHs by removing work/ path component.

Author: likewise at openembedded.org
Branch: org.openembedded.dev
Revision: 0a4ab83c5e46677b239452867d3205ca5843586f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0a4ab83c5e46677b239452867d3205ca5843586f
Files:
1
classes/insane.bbclass
Diffs:

#
# mt diff -r038bc21b349c21561050092a7a6d68a019b921e1 -r0a4ab83c5e46677b239452867d3205ca5843586f
#
# 
# 
# patch "classes/insane.bbclass"
#  from [dd43fc52d5db976c0dca49daf4e968d5e502fa31]
#    to [8183b4aa03a2ff1bb5d7f4444d59cb867df95efa]
# 
============================================================
--- classes/insane.bbclass	dd43fc52d5db976c0dca49daf4e968d5e502fa31
+++ classes/insane.bbclass	8183b4aa03a2ff1bb5d7f4444d59cb867df95efa
@@ -203,6 +203,7 @@ def package_qa_check_rpath(file,name,d):
     import bb, os
     scanelf = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'scanelf')
     bad_dir = bb.data.getVar('TMPDIR', d, True) + "/work"
+    bad_dir_test = bb.data.getVar('TMPDIR', d, True)
     if not os.path.exists(scanelf):
         bb.fatal("Can not check RPATH scanelf not found")
     if not bad_dir in bb.data.getVar('WORKDIR', d, True):
@@ -211,7 +212,7 @@ def package_qa_check_rpath(file,name,d):
     output = os.popen("%s -Byr %s" % (scanelf,file))
     txt    = output.readline().split()
     for line in txt:
-        if bad_dir in line:
+        if bad_dir_test in line:
             package_qa_write_error( 1, name, file, d)
             bb.error("QA Issue package %s contains bad RPATH %s in file %s" % (name, line, file))
             return False
@@ -405,7 +406,7 @@ python do_package_qa () {
             rdepends_sane = False
 
     if not walk_sane or not rdepends_sane:
-        bb.fatal("QA ran found fatal errors. Please consider fixing them")
+        bb.fatal("QA run found fatal errors. Please consider fixing them.")
     bb.note("DONE with PACKAGE QA")
 }