summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorAdrian Fiergolski <adrian.fiergolski@cern.ch>2017-12-11 18:08:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-06 10:13:57 +0000
commite5d7b7d80210f45ad1575dd8b38d84a8b3c843f1 (patch)
treeb4ee6105b9a4d5d788604e0f42d0aa57d1e71b2e /scripts
parent1b8f0fa9b1265de25ae3039e2dc1ebcc4ea1904b (diff)
downloadpoky-e5d7b7d80210f45ad1575dd8b38d84a8b3c843f1.tar.gz
wic: Fix a path to a psuedo state directory (PSEUDO_LOCALSTATEDIR).
In case of 'new_rootfs' the psuedo directory is not copied. Thus PSEUDO_LOCALSTATEDIR should still point to the dsa 'native_sysroot'/../pseudo. Otherwise PSEUDO_LOCALSTATEDIR points to a not existing director ('new_rootfs'/../pseudo) and UID and GUID attributes are not applied to files of the image. (From OE-Core rev: 4c1741ad08c809c83cd9670b14850687b598e728) Signed-off-by: Adrian Fiergolski <adrian.fiergolski@cern.ch> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 19642e2d6e015072e4a413f4f57aee65df757cb9) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/wic/partition.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 66e61ba70c..84fe85d62b 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -206,7 +206,7 @@ class Partition():
206 """ 206 """
207 p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot) 207 p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot)
208 p_localstatedir = os.environ.get("PSEUDO_LOCALSTATEDIR", 208 p_localstatedir = os.environ.get("PSEUDO_LOCALSTATEDIR",
209 "%s/../pseudo" % rootfs_dir) 209 "%s/../pseudo" % get_bitbake_var("IMAGE_ROOTFS"))
210 p_passwd = os.environ.get("PSEUDO_PASSWD", rootfs_dir) 210 p_passwd = os.environ.get("PSEUDO_PASSWD", rootfs_dir)
211 p_nosymlinkexp = os.environ.get("PSEUDO_NOSYMLINKEXP", "1") 211 p_nosymlinkexp = os.environ.get("PSEUDO_NOSYMLINKEXP", "1")
212 pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix 212 pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix