From 176a36ace1624f3bbe498307aeabbd7935de14e6 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 19 Sep 2013 11:03:43 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'meta/classes') 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) -- cgit v1.2.3