[gnome-continuous-yocto/gnomeostree-3.28-rocko: 57/218] wic: Fix a path to a psuedo state directory (PSEUDO_LOCALSTATEDIR).
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 57/218] wic: Fix a path to a psuedo state directory (PSEUDO_LOCALSTATEDIR).
- Date: Mon, 21 May 2018 08:40:01 +0000 (UTC)
commit e5d7b7d80210f45ad1575dd8b38d84a8b3c843f1
Author: Adrian Fiergolski <adrian fiergolski cern ch>
Date: 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.
(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>
scripts/lib/wic/partition.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]