<div dir="ltr">Can you squash stuff like this into the first patch, the history doesn't need to see your working.<div><br></div><div>Also, does the hardlink copy get cleaned up?</div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 27 June 2017 at 10:57, Ed Bartosh <span dir="ltr"><<a href="mailto:ed.bartosh@linux.intel.com" target="_blank">ed.bartosh@linux.intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Used unique suffix (line number from .wks file) for the<br>
copied rootfs directory to avoid possible conflicts.<br>
<br>
Signed-off-by: Ed Bartosh <<a href="mailto:ed.bartosh@linux.intel.com">ed.bartosh@linux.intel.com</a>><br>
---<br>
scripts/lib/wic/plugins/<wbr>source/rootfs.py | 2 +-<br>
1 file changed, 1 insertion(+), 1 deletion(-)<br>
<br>
diff --git a/scripts/lib/wic/plugins/<wbr>source/rootfs.py b/scripts/lib/wic/plugins/<wbr>source/rootfs.py<br>
index e438158..aec720f 100644<br>
--- a/scripts/lib/wic/plugins/<wbr>source/rootfs.py<br>
+++ b/scripts/lib/wic/plugins/<wbr>source/rootfs.py<br>
@@ -88,7 +88,7 @@ class RootfsPlugin(SourcePlugin):<br>
if part.exclude_path is not None:<br>
# We need a new rootfs directory we can delete files from. Copy to<br>
# workdir.<br>
- new_rootfs = os.path.realpath(os.path.join(<wbr>cr_workdir, "rootfs"))<br>
+ new_rootfs = os.path.realpath(os.path.join(<wbr>cr_workdir, "rootfs%d" % part.lineno))<br>
<br>
if os.path.lexists(new_rootfs):<br>
shutil.rmtree(os.path.join(<wbr>new_rootfs))<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.1.4<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>