From 092f4fafaa051a254588f8c9eee1db66e6aaacab Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Fri, 28 Jul 2017 12:29:26 +0300 Subject: wic: rootfs: make copied rootfs unique Used unique suffix (line number from .wks file) for the copied rootfs directory to avoid possible conflicts. (From OE-Core rev: 01efc234a8caab67ed3138ab2de9bbd82ce97b44) Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- scripts/lib/wic/plugins/source/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/lib/wic') diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index e438158f34..aec720fb22 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)) -- cgit v1.2.3-54-g00ecf