[OE-core] [PATCH] staging: remove hard-coded values from _FIXMEs
Andrej Valek
andrej.valek at siemens.com
Mon Sep 17 13:41:58 UTC 2018
Let users to override these values in their layers and could match them
with values in EXTRA_STAGING_FIXMES.
Signed-off-by: Andrej Valek <andrej.valek at siemens.com>
---
meta/classes/staging.bbclass | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 84e13bab59..6db501dac1 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -127,6 +127,8 @@ python do_populate_sysroot_setscene () {
}
addtask do_populate_sysroot_setscene
+SYSROOT_STAGING_FIXMES ?= "COMPONENTS_DIR HOSTTOOLS_DIR PKGDATA_DIR PSEUDO_LOCALSTATEDIR LOGFIFO"
+
def staging_copyfile(c, target, dest, postinsts, seendirs):
import errno
@@ -167,7 +169,7 @@ def staging_processfixme(fixme, target, recipesysroot, recipesysrootnative, d):
if not fixme:
return
cmd = "sed -e 's:^[^/]*/:%s/:g' %s | xargs sed -i -e 's:FIXMESTAGINGDIRTARGET:%s:g; s:FIXMESTAGINGDIRHOST:%s:g'" % (target, " ".join(fixme), recipesysroot, recipesysrootnative)
- for fixmevar in ['COMPONENTS_DIR', 'HOSTTOOLS_DIR', 'PKGDATA_DIR', 'PSEUDO_LOCALSTATEDIR', 'LOGFIFO']:
+ for fixmevar in d.getVar("SYSROOT_STAGING_FIXMES").split():
fixme_path = d.getVar(fixmevar)
cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path)
bb.debug(2, cmd)
--
2.11.0
More information about the Openembedded-core
mailing list