diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-07 21:52:20 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-07 21:57:11 +0100 |
commit | 33a0c7ad622653160ad5373b463228a1845fdd9d (patch) | |
tree | 81ccc2a0d4874848005de315fd8567ca9be3e395 /scripts/lib/wic/plugins | |
parent | fc054bc1134b506dcf16d85cee53c4a37a4c5231 (diff) | |
download | openembedded-core-contrib-33a0c7ad622653160ad5373b463228a1845fdd9d.tar.gz |
Revert "wic: Fix permissions when using exclude or include path"
This reverts commit 36993eea89d1c011397b7692b9b8d61b499d0171.
After discussion on the mailing list it was felt these changes
were not ready yet.
Diffstat (limited to 'scripts/lib/wic/plugins')
-rw-r--r-- | scripts/lib/wic/plugins/source/rootfs.py | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index 40419a64b3..705aeb5563 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py @@ -16,11 +16,11 @@ import os import shutil import sys -from oe.path import copyhardlinktree, copytree +from oe.path import copyhardlinktree from wic import WicError from wic.pluginbase import SourcePlugin -from wic.misc import get_bitbake_var, exec_native_cmd +from wic.misc import get_bitbake_var logger = logging.getLogger('wic') @@ -44,15 +44,6 @@ class RootfsPlugin(SourcePlugin): return os.path.realpath(image_rootfs_dir) - @staticmethod - def __get_pseudo(native_sysroot, rootfs): - pseudo = "export PSEUDO_PREFIX=%s/usr;" % native_sysroot - pseudo += "export PSEUDO_LOCALSTATEDIR=%s;" % os.path.join(rootfs, "../pseudo") - pseudo += "export PSEUDO_PASSWD=%s;" % rootfs - pseudo += "export PSEUDO_NOSYMLINKEXP=1;" - pseudo += "%s " % get_bitbake_var("FAKEROOTCMD") - return pseudo - @classmethod def do_prepare_partition(cls, part, source_params, cr, cr_workdir, oe_builddir, bootimg_dir, kernel_dir, @@ -87,15 +78,8 @@ class RootfsPlugin(SourcePlugin): if os.path.lexists(new_rootfs): shutil.rmtree(os.path.join(new_rootfs)) - copyhardlinktree(part.rootfs_dir, new_rootfs) - if os.path.lexists(os.path.join(new_rootfs, "../pseudo")): - shutil.rmtree(os.path.join(new_rootfs, "../pseudo")) - copytree(os.path.join(part.rootfs_dir, "../pseudo"), - os.path.join(new_rootfs, "../pseudo")) - pseudo_cmd = "%s -B -m %s -M %s" % (cls.__get_pseudo(native_sysroot,new_rootfs), - part.rootfs_dir, new_rootfs) - exec_native_cmd(pseudo_cmd, native_sysroot) + copyhardlinktree(part.rootfs_dir, new_rootfs) for path in part.include_path or []: copyhardlinktree(path, new_rootfs) |