[oe-commits] Ross Burton : insane: don't abort if workdir is not TMPDIR/work

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 176a36ace1624f3bbe498307aeabbd7935de14e6
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=176a36ace1624f3bbe498307aeabbd7935de14e6

Author: Ross Burton <ross.burton at intel.com>
Date:   Thu Sep 19 11:03:43 2013 +0100

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 at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/insane.bbclass |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 524cdca..a784aff 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)