On Wed, 4 Mar 2020 09:34:37 +0100 Ricardo Ribalda Delgado <[email protected]> wrote:
> When parameters include_path or exclude_path are passed to the rootfs > plugin, it will copy the partition content into a folder and make all > the modifications there. > > This is done using copyhardlinktree(), which does not take into > consideration the content of the pseudo folder, which contains the > information about the right permissions and ownership of the folders. How are you running wic here? In the do_image_wic task it's executed under pseudo so all this is handled already. Executing wic outside of bitbake may need some more testing here. > > This results in a rootfs owned by the user that is running the wic > command (usually UID 1000), which makes some rootfs unbootable. > > To fix this we copy the content of the pseudo folders to the new folder > and modify the pseudo database using the "pseudo -B" command. > > Signed-off-by: Ricardo Ribalda Delgado <[email protected]> > --- > scripts/lib/wic/plugins/source/rootfs.py | 22 +++++++++++++++++++--- > 1 file changed, 19 insertions(+), 3 deletions(-) > > diff --git a/scripts/lib/wic/plugins/source/rootfs.py > b/scripts/lib/wic/plugins/source/rootfs.py > index 705aeb5563..40419a64b3 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 > +from oe.path import copyhardlinktree, copytree > > from wic import WicError > from wic.pluginbase import SourcePlugin > -from wic.misc import get_bitbake_var > +from wic.misc import get_bitbake_var, exec_native_cmd > > logger = logging.getLogger('wic') > > @@ -44,6 +44,15 @@ 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, > @@ -78,9 +87,16 @@ 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")) I don't like stepping up the directory tree like this. We should be more explicit with the paths. > + 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) > + > for path in part.include_path or []: > copyhardlinktree(path, new_rootfs) ^^^^^^^^^^^^^^^^ If this is the right approach I imagine you would also need to fix things up with pseudo after the copyhardlinktree call above. -- Paul Barker Konsulko Group -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
