On Tue, Jun 27, 2017 at 01:21:41PM +0100, Burton, Ross wrote: > Can you squash stuff like this into the first patch, the history doesn't > need to see your working. > This commit doesn't fit to any other from my point of view. It's just a fix for rootfs plugin.
I'll try to squash other commits. > Also, does the hardlink copy get cleaned up? > Yes, it does. It's created in the temporary directory, which is removed after image is ready. > Ross > > On 27 June 2017 at 10:57, Ed Bartosh <[email protected]> wrote: > > > Used unique suffix (line number from .wks file) for the > > copied rootfs directory to avoid possible conflicts. > > > > Signed-off-by: Ed Bartosh <[email protected]> > > --- > > scripts/lib/wic/plugins/source/rootfs.py | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/scripts/lib/wic/plugins/source/rootfs.py > > b/scripts/lib/wic/plugins/source/rootfs.py > > index e438158..aec720f 100644 > > --- a/scripts/lib/wic/plugins/source/rootfs.py > > +++ b/scripts/lib/wic/plugins/source/rootfs.py > > @@ -88,7 +88,7 @@ class RootfsPlugin(SourcePlugin): > > if part.exclude_path is not None: > > # We need a new rootfs directory we can delete files from. > > Copy to > > # workdir. > > - new_rootfs = os.path.realpath(os.path.join(cr_workdir, > > "rootfs")) > > + new_rootfs = os.path.realpath(os.path.join(cr_workdir, > > "rootfs%d" % part.lineno)) > > > > if os.path.lexists(new_rootfs): > > shutil.rmtree(os.path.join(new_rootfs)) > > -- > > 2.1.4 > > > > -- > > _______________________________________________ > > Openembedded-core mailing list > > [email protected] > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- -- Regards, Ed -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
