mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

wic: rootfs: make copied rootfs unique

Browse Source 
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 <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2017-07-28 12:29:26 +03:00
committed by Richard Purdie
parent d4e60fe6a4
commit 092f4fafaa
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/lib/wic/plugins/source/rootfs.py
View File

@@ -88,7 +88,7 @@ class RootfsPlugin(SourcePlugin):
if part.exclude_path is not None: if part.exclude_path is not None:
# We need a new rootfs directory we can delete files from. Copy to # We need a new rootfs directory we can delete files from. Copy to
# workdir. # 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): if os.path.lexists(new_rootfs):
shutil.rmtree(os.path.join(new_rootfs)) shutil.rmtree(os.path.join(new_rootfs))