]> code.ossystems Code Review - openembedded-core.git/commitdiff
wic: Fix a path to a psuedo state directory (PSEUDO_LOCALSTATEDIR).
authorAdrian Fiergolski <adrian.fiergolski@cern.ch>
Mon, 11 Dec 2017 17:08:26 +0000 (18:08 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 2 Jan 2018 17:24:12 +0000 (17:24 +0000)
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.

Signed-off-by: Adrian Fiergolski <adrian.fiergolski@cern.ch>
Signed-off-by: Ross Burton <ross.burton@intel.com>
scripts/lib/wic/partition.py

index c0b67d829f80d61135a799f6b36ac67d867dbcd0..72f2e2708f5e7db5eb995c20c8eda45cabed8152 100644 (file)
@@ -208,7 +208,7 @@ class Partition():
         """
         p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot)
         p_localstatedir = os.environ.get("PSEUDO_LOCALSTATEDIR",
-                                         "%s/../pseudo" % rootfs_dir)
+                                         "%s/../pseudo" %  get_bitbake_var("IMAGE_ROOTFS"))
         p_passwd = os.environ.get("PSEUDO_PASSWD", rootfs_dir)
         p_nosymlinkexp = os.environ.get("PSEUDO_NOSYMLINKEXP", "1")
         pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix