summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-09-19 11:03:43 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-20 10:49:19 +0100
commit176a36ace1624f3bbe498307aeabbd7935de14e6 (patch)
tree3d94ab0b59fd1bcb5f0125bc86a9bf0d81870346
parent1eee097f2e29b9d6934711c0b1d32e59e9542f53 (diff)
downloadopenembedded-core-176a36ace1624f3bbe498307aeabbd7935de14e6.tar.gz
openembedded-core-176a36ace1624f3bbe498307aeabbd7935de14e6.tar.bz2
openembedded-core-176a36ace1624f3bbe498307aeabbd7935de14e6.zip
insane: don't abort if workdir is not TMPDIR/work
The BASE_WORKDIR variable can be used instead of enforcing WORKDIR being TMPDIR/work (and aborting the build if it isn't). Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/insane.bbclass5
1 files changed, 1 insertions, 4 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 524cdca244..a784aff3a9 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -175,10 +175,7 @@ def package_qa_check_rpath(file,name, d, elf, messages):
if os.path.islink(file):
return
- bad_dirs = [d.getVar('TMPDIR', True) + "/work", d.getVar('STAGING_DIR_TARGET', True)]
-
- if not bad_dirs[0] in d.getVar('WORKDIR', True):
- bb.fatal("This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check")
+ bad_dirs = [d.getVar('BASE_WORKDIR', True), d.getVar('STAGING_DIR_TARGET', True)]
phdrs = elf.run_objdump("-p", d)