From 7b56a4327bdef25b99e1376fc30f03a8dba45885 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Wed, 3 May 2017 23:13:39 +0200 Subject: useradd.bbclass: Handle COMPONENTS_DIR when restoring state The export of PSEUDO in useradd_sysroot() contains references to ${COMPONENTS_DIR}. These need to be handled when restoring postinst-useradd-${PN} from the sstate cache. (From OE-Core rev: 097875bc9ab9d60a452b01ac6825775983684d68) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/classes/staging.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/staging.bbclass') diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 31cd625640..565638f48d 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -249,7 +249,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 ['HOSTTOOLS_DIR', 'PKGDATA_DIR']: + for fixmevar in ['COMPONENTS_DIR', 'HOSTTOOLS_DIR', 'PKGDATA_DIR']: fixme_path = d.getVar(fixmevar) cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path) bb.note(cmd) -- cgit v1.2.3-54-g00ecf