summaryrefslogtreecommitdiffstats
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-22 12:19:32 +0100
commit06965e88e6380ac68bca0ebc68a45adf02c1031d (patch)
tree4a72ca600d588fb8d52a549503a06ff271da2da3
parentfa0fd37f8ed74d56c1e5b175bade575b90e000e6 (diff)
downloadpoky-06965e88e6380ac68bca0ebc68a45adf02c1031d.tar.gz
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). (From OE-Core rev: 176a36ace1624f3bbe498307aeabbd7935de14e6) 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):
175 if os.path.islink(file): 175 if os.path.islink(file):
176 return 176 return
177 177
178 bad_dirs = [d.getVar('TMPDIR', True) + "/work", d.getVar('STAGING_DIR_TARGET', True)] 178 bad_dirs = [d.getVar('BASE_WORKDIR', True), d.getVar('STAGING_DIR_TARGET', True)]
179
180 if not bad_dirs[0] in d.getVar('WORKDIR', True):
181 bb.fatal("This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check")
182 179
183 phdrs = elf.run_objdump("-p", d) 180 phdrs = elf.run_objdump("-p", d)
184 181