From: Ed Bartosh Date: Fri, 28 Jul 2017 09:29:26 +0000 (+0300) Subject: wic: rootfs: make copied rootfs unique X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~20556 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01efc234a8caab67ed3138ab2de9bbd82ce97b44;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git wic: rootfs: make copied rootfs unique Used unique suffix (line number from .wks file) for the copied rootfs directory to avoid possible conflicts. Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index e438158f344..aec720fb227 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))