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:45:12 +0100 |
| commit | 01efc234a8caab67ed3138ab2de9bbd82ce97b44 (patch) | |
| tree | 9e2c158cb64c60228e684063ba11b8abff3e83e0 | |
| parent | 28d2d7d6f79df08431187c7debaab2a3fa516671 (diff) | |
| download | openembedded-core-contrib-01efc234a8caab67ed3138ab2de9bbd82ce97b44.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.
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): 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)) |