wic: Use ROOTFS_DIR to locate pseudo_dir

Fixed when wks is:
part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4096 --fixed-size 256M
part / --source rootfs --exclude-path=var/ --ondisk mmcblk0 --fstype=ext4 --label root --align 4096
part /var --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/var --ondrive mmcblk0 --fstype=ext4 --label var --align 4096 --fixed-size 1024M --fsoptions=ro,relatime,sync

$ bitbake <image>
$ wic create <wks> -e <image>
WARNING: /path/to/rootfs/var/../pseudo folder does not exist. Usernames and permissions will be invalid

The --rootfs-dir can be anywhere, so the ../pseudo may not exist, use
ROOTFS_DIR to fix the problem.

From: Rath Anil Kumar <AnilKumar.Rath@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>

diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py
index 25bb41dd7022ddc64fd970a0f6cd9abe94ef9b66..11b09c1e80e2b7a23b0382bb5f95011a4c49f7e7 100644 (file)
--- a/scripts/lib/wic/plugins/source/rootfs.py
+++ b/scripts/lib/wic/plugins/source/rootfs.py
@@ -95,7 +95,7 @@ class RootfsPlugin(SourcePlugin):
 
         part.rootfs_dir = cls.__get_rootfs_dir(rootfs_dir)
         part.has_fstab = os.path.exists(os.path.join(part.rootfs_dir, "etc/fstab"))
-        pseudo_dir = os.path.join(part.rootfs_dir, "../pseudo")
+        pseudo_dir = os.path.join(krootfs_dir['ROOTFS_DIR'], "../pseudo")
         if not os.path.lexists(pseudo_dir):
             pseudo_dir = os.path.join(cls.__get_rootfs_dir(None), '../pseudo')