Patchwork [2/2] insane: don't abort if workdir is not TMPDIR/work

login
register
mail settings
Submitter Ross Burton
Date Aug. 13, 2013, 10:11 a.m.
Message ID <e91cbd17131101d1c470669acce66682ae06960a.1376388241.git.ross.burton@intel.com>
Download mbox | patch
Permalink /patch/55537/
State Accepted
Commit 06965e88e6380ac68bca0ebc68a45adf02c1031d
Headers show

Comments

Ross Burton - Aug. 13, 2013, 10:11 a.m.
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>
---
 meta/classes/insane.bbclass |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Patch

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index aa02985..865db5e 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)