summaryrefslogtreecommitdiffstats
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-02 17:24:37 +0000
commitfaae2df397f0fc01ec7e7a872d2dedf24cdc771d (patch)
tree42aae09b51de5a6c0eac36b30ec8360b57b0f473
parentd97089c38837810afe2900f9f30cee1bba5f4fce (diff)
downloadpoky-faae2df397f0fc01ec7e7a872d2dedf24cdc771d.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: 19642e2d6e015072e4a413f4f57aee65df757cb9) Signed-off-by: Adrian Fiergolski <adrian.fiergolski@cern.ch> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 c0b67d829f..72f2e2708f 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -208,7 +208,7 @@ class Partition():
208 """ 208 """
209 p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot) 209 p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot)
210 p_localstatedir = os.environ.get("PSEUDO_LOCALSTATEDIR", 210 p_localstatedir = os.environ.get("PSEUDO_LOCALSTATEDIR",
211 "%s/../pseudo" % rootfs_dir) 211 "%s/../pseudo" % get_bitbake_var("IMAGE_ROOTFS"))
212 p_passwd = os.environ.get("PSEUDO_PASSWD", rootfs_dir) 212 p_passwd = os.environ.get("PSEUDO_PASSWD", rootfs_dir)
213 p_nosymlinkexp = os.environ.get("PSEUDO_NOSYMLINKEXP", "1") 213 p_nosymlinkexp = os.environ.get("PSEUDO_NOSYMLINKEXP", "1")
214 pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix 214 pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix