summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado <ricardo.ribalda@gmail.com>2020-04-19 08:35:30 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-04-26 14:00:50 +0100
commitc58711f0ea2a4d3b54e9f5f442abe3192f4697d0 (patch)
tree6022cc45dbc3a27510b55a1ac1412d7b9abb07b5 /scripts/lib
parent90164f0f3d713de70842317869343dd4a3ef5140 (diff)
downloadpoky-c58711f0ea2a4d3b54e9f5f442abe3192f4697d0.tar.gz
wic: Fix multi images .wks with bitbake
In order to support .wks files with multiple images inside bitbake we need to explicitly set the pseudo database in use. Eg: If we try this .mks: part / --source rootfs --ondisk sda --fstype=ext4 part /export --source rootfs --rootfs=core-image-minimal-mtdutils --fstype=ext4 The username for all the files under /export will be set to the runner of bitbake (usually UID 1000). Before we run wic, we need to make sure that the pseudo database will be flushed, and contains all the data needed. Cc: Paul Barker <pbarker@konsulko.com> (From OE-Core rev: dde90a5dd2b22a539095d1bac82acc15c6380ac8) Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/wic/partition.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index b02711be37..d850fbd1b1 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -200,13 +200,10 @@ class Partition():
200 p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot) 200 p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot)
201 if (pseudo_dir == None): 201 if (pseudo_dir == None):
202 pseudo_dir = "%s/../pseudo" % rootfs_dir 202 pseudo_dir = "%s/../pseudo" % rootfs_dir
203 p_localstatedir = os.environ.get("PSEUDO_LOCALSTATEDIR", pseudo_dir)
204 p_passwd = os.environ.get("PSEUDO_PASSWD", rootfs_dir)
205 p_nosymlinkexp = os.environ.get("PSEUDO_NOSYMLINKEXP", "1")
206 pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix 203 pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix
207 pseudo += "export PSEUDO_LOCALSTATEDIR=%s;" % p_localstatedir 204 pseudo += "export PSEUDO_LOCALSTATEDIR=%s;" % pseudo_dir
208 pseudo += "export PSEUDO_PASSWD=%s;" % p_passwd 205 pseudo += "export PSEUDO_PASSWD=%s;" % rootfs_dir
209 pseudo += "export PSEUDO_NOSYMLINKEXP=%s;" % p_nosymlinkexp 206 pseudo += "export PSEUDO_NOSYMLINKEXP=1;"
210 pseudo += "%s " % get_bitbake_var("FAKEROOTCMD") 207 pseudo += "%s " % get_bitbake_var("FAKEROOTCMD")
211 208
212 rootfs = "%s/rootfs_%s.%s.%s" % (cr_workdir, self.label, 209 rootfs = "%s/rootfs_%s.%s.%s" % (cr_workdir, self.label,