diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-07-28 12:29:26 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-30 08:46:19 +0100 |
| commit | 092f4fafaa051a254588f8c9eee1db66e6aaacab (patch) | |
| tree | 44732c3557df47b5cde056ca1632dd90025779cc | |
| parent | d4e60fe6a41b2a04bc1af81e54da6e35f7ed4386 (diff) | |
| download | poky-092f4fafaa051a254588f8c9eee1db66e6aaacab.tar.gz | |
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 <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | scripts/lib/wic/plugins/source/rootfs.py | 2 |
1 files changed, 1 insertions, 1 deletions
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): | |||
| 88 | if part.exclude_path is not None: | 88 | if part.exclude_path is not None: |
| 89 | # We need a new rootfs directory we can delete files from. Copy to | 89 | # We need a new rootfs directory we can delete files from. Copy to |
| 90 | # workdir. | 90 | # workdir. |
| 91 | new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs")) | 91 | new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs%d" % part.lineno)) |
| 92 | 92 | ||
| 93 | if os.path.lexists(new_rootfs): | 93 | if os.path.lexists(new_rootfs): |
| 94 | shutil.rmtree(os.path.join(new_rootfs)) | 94 | shutil.rmtree(os.path.join(new_rootfs)) |