summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorLeon Woestenberg <leon.woestenberg@gmail.com>2007-04-26 22:19:39 +0000
committerLeon Woestenberg <leon.woestenberg@gmail.com>2007-04-26 22:19:39 +0000
commit84470181159bb115156f64726d4342148d091998 (patch)
tree42362c2e0bda1a22f95bf94031697216a2d0c82b /classes
parent5fe86ee223dc74fcddffe5563f66f2ca2577068c (diff)
insane.bbclass: RPATH check was always true due to scanelf output including the file path.
Diffstat (limited to 'classes')
-rw-r--r--classes/insane.bbclass13
1 files changed, 10 insertions, 3 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index c424a573d3..d07b181dbd 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -21,7 +21,8 @@
# We play a special package function
inherit package
-PACKAGE_DEPENDS += "pax-utils-native chrpath-native"
+PACKAGE_DEPENDS += "pax-utils-native"
+#PACKAGE_DEPENDS += chrpath-native"
PACKAGEFUNCS += " do_package_qa "
@@ -202,19 +203,25 @@ def package_qa_check_rpath(file,name,d):
"""
import bb, os
scanelf = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'scanelf')
+ #chrpath = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'chrpath')
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")
+ bb.fatal("Can not check RPATH, scanelf (part of pax-utils-native) not found")
+ #if not os.path.exists(chrpath):
+ # bb.fatal("Can not fix RPATH, chrpath (part of chrpath-native) not found")
if not bad_dir in bb.data.getVar('WORKDIR', d, True):
bb.fatal("This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check")
- output = os.popen("%s -Byr %s" % (scanelf,file))
+ bb.note("%s -F%%r#F %s" % (scanelf,file))
+ output = os.popen("%s -F%%r#F %s" % (scanelf,file))
txt = output.readline().split()
for line in txt:
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))
+ #bb.note("Fixing RPATH for you in %s" % file)
+ #os.popen("%s -r /lib %s" % (chrpath,file))
return False
return True