[oe-commits] [openembedded-core] 43/55: wic: Fix a path to a psuedo state directory (PSEUDO_LOCALSTATEDIR).

git at git.openembedded.org git at git.openembedded.org
Fri Jan 5 12:08:01 UTC 2018


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch rocko-next
in repository openembedded-core.

commit 6f5c95d1c03f7c5dfd6a1d1b888789590342d7de
Author: Adrian Fiergolski <adrian.fiergolski at cern.ch>
AuthorDate: Mon Dec 11 18:08:26 2017 +0100

    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.
    
    Signed-off-by: Adrian Fiergolski <adrian.fiergolski at cern.ch>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    (cherry picked from commit 19642e2d6e015072e4a413f4f57aee65df757cb9)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 scripts/lib/wic/partition.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 66e61ba..84fe85d 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -206,7 +206,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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list