From: Ed Bartosh <ed.bartosh@linux.intel.com>
To: "Burton, Ross" <ross.burton@intel.com>
Cc: OE-core <openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH 5/7] wic: rootfs: make copied rootfs unique
Date: Tue, 27 Jun 2017 16:09:59 +0300 [thread overview]
Message-ID: <20170627130959.GA4850@linux.intel.com> (raw)
In-Reply-To: <CAJTo0LaOHMuAiw1Rsm2AA-01cCuG2gqD0WhM+qisWpiQD0Ar9g@mail.gmail.com>
On Tue, Jun 27, 2017 at 01:21:41PM +0100, Burton, Ross wrote:
> Can you squash stuff like this into the first patch, the history doesn't
> need to see your working.
>
This commit doesn't fit to any other from my point of view.
It's just a fix for rootfs plugin.
I'll try to squash other commits.
> Also, does the hardlink copy get cleaned up?
>
Yes, it does. It's created in the temporary directory, which
is removed after image is ready.
> Ross
>
> On 27 June 2017 at 10:57, Ed Bartosh <ed.bartosh@linux.intel.com> wrote:
>
> > 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>
> > ---
> > scripts/lib/wic/plugins/source/rootfs.py | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/scripts/lib/wic/plugins/source/rootfs.py
> > b/scripts/lib/wic/plugins/source/rootfs.py
> > index e438158..aec720f 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))
> > --
> > 2.1.4
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
> >
--
--
Regards,
Ed
next prev parent reply other threads:[~2017-06-27 13:12 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-27 9:57 [PATCH 0/7] #11662 - wic should mount /boot Ed Bartosh
2017-06-27 9:57 ` [PATCH 1/7] wic: copy rootfs directory before changing fstab Ed Bartosh
2017-06-27 9:57 ` [PATCH 2/7] wic: use correct rootfs in the report Ed Bartosh
2017-06-27 9:57 ` [PATCH 3/7] wic: use absolute paths in rootfs plugin Ed Bartosh
2017-06-27 9:57 ` [PATCH 4/7] wic: rootfs: fix rootfs path reporting Ed Bartosh
2017-06-27 9:57 ` [PATCH 5/7] wic: rootfs: make copied rootfs unique Ed Bartosh
2017-06-27 12:21 ` Burton, Ross
2017-06-27 13:09 ` Ed Bartosh [this message]
2017-06-27 9:57 ` [PATCH 6/7] wic: add /boot mount point to fstab by default Ed Bartosh
2017-06-27 9:57 ` [PATCH 7/7] oe-selftest: wic: fix test_quemu Ed Bartosh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170627130959.GA4850@linux.intel.com \
--to=ed.bartosh@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
--cc=ross.burton@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox