[OE-core] [PATCH 5/7] wic: rootfs: make copied rootfs unique

[Burton, Ross]

Can you squash stuff like this into the first patch, the history doesn't
need to see your working.

Also, does the hardlink copy get cleaned up?

Ross

On 27 June 2017 at 10:57, Ed Bartosh <ed.bartosh at linux.intel.com> wrote:

> Used unique suffix (line number from .wks file) for the
> copied rootfs directory to avoid possible conflicts.
>
> Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
> ---
>  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
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20170627/d725ec8a/attachment-0002.html>