From: Henning Schild <henning.schild@siemens.com>
To: Jan Kiszka <jan.kiszka@siemens.com>
Cc: isar-users <isar-users@googlegroups.com>,
Frank Lenormand <lenormf@gmail.com>
Subject: Re: [PATCH 2/7] wic: Remove obsolete reference to msger logger
Date: Mon, 26 Nov 2018 11:07:17 +0100 [thread overview]
Message-ID: <20181126110717.0fae7592@md1za8fc.ad001.siemens.net> (raw)
In-Reply-To: <e917817c-8e14-77c3-37e6-39d9c9ef3546@siemens.com>
Am Mon, 26 Nov 2018 10:50:57 +0100
schrieb Jan Kiszka <jan.kiszka@siemens.com>:
> On 26.11.18 10:45, Henning Schild wrote:
> > Is this a cherry pick of a single commit on wic? If so i am stronly
> > against that. Bump the whole thing but do not fork it.
> >
>
> What is the baseline then? Where can we move to, i.e. what were you
> selection criteria back then?
We are currently at "131629ca6238ea05", without modification. The pick
was made by Frank Lenormand in "2b164b18fd639c9c". I guess without a
special reason.
For a bump i would suggest whatever the latest OE release uses, just
like bitbake. I already tried it once and it broke the build in a weird
way ...
Henning
> Jan
>
> > Henning
> >
> > Am Mon, 26 Nov 2018 10:38:57 +0100
> > schrieb Jan Kiszka <jan.kiszka@siemens.com>:
> >
> >> From: Jan Kiszka <jan.kiszka@siemens.com>
> >>
> >> OE core commit b561292c4e7b.
> >>
> >> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> >> ---
> >> scripts/lib/wic/plugins/source/rootfs.py | 7 +++++--
> >> 1 file changed, 5 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/scripts/lib/wic/plugins/source/rootfs.py
> >> b/scripts/lib/wic/plugins/source/rootfs.py index f2e2ca8..944ec5f
> >> 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py
> >> +++ b/scripts/lib/wic/plugins/source/rootfs.py
> >> @@ -28,6 +28,7 @@
> >> import logging
> >> import os
> >> import shutil
> >> +import sys
> >>
> >> from oe.path import copyhardlinktree
> >>
> >> @@ -98,7 +99,8 @@ class RootfsPlugin(SourcePlugin):
> >> for orig_path in part.exclude_path:
> >> path = orig_path
> >> if os.path.isabs(path):
> >> - msger.error("Must be relative:
> >> --exclude-path=%s" % orig_path)
> >> + logger.error("Must be relative:
> >> --exclude-path=%s" % orig_path)
> >> + sys.exit(1)
> >>
> >> full_path =
> >> os.path.realpath(os.path.join(new_rootfs, path))
> >> @@ -106,7 +108,8 @@ class RootfsPlugin(SourcePlugin):
> >> # because doing so could be quite disastrous (we
> >> will delete the # directory).
> >> if not full_path.startswith(new_rootfs):
> >> - msger.error("'%s' points to a path outside the
> >> rootfs" % orig_path)
> >> + logger.error("'%s' points to a path outside
> >> the rootfs" % orig_path)
> >> + sys.exit(1)
> >>
> >> if path.endswith(os.sep):
> >> # Delete content only.
> >
>
>
next prev parent reply other threads:[~2018-11-26 10:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-26 9:38 [PATCH 0/7] u-boot-script rework, the Final One (tm) Jan Kiszka
2018-11-26 9:38 ` [PATCH 1/7] wic: Move isar plugins out of example layer to core Jan Kiszka
2018-11-26 9:38 ` [PATCH 2/7] wic: Remove obsolete reference to msger logger Jan Kiszka
2018-11-26 9:45 ` Henning Schild
2018-11-26 9:50 ` Jan Kiszka
2018-11-26 10:07 ` Henning Schild [this message]
2018-11-26 11:02 ` Jan Kiszka
2018-11-26 9:38 ` [PATCH 3/7] meta-isar: Factor out bananapi machine config Jan Kiszka
2018-11-26 9:38 ` [PATCH 4/7] wic: Add rootfs-u-boot Jan Kiszka
2018-11-26 9:39 ` [PATCH 5/7] meta-isar: Switch bananapi and de0-nano-soc to rootfs-u-boot Jan Kiszka
2018-11-26 9:39 ` [PATCH 6/7] u-boot-script: Make truly generic Jan Kiszka
2018-11-26 9:39 ` [PATCH 7/7] meta: Fold wks-file class into wic-img Jan Kiszka
2018-11-29 12:15 ` [PATCH 0/7] u-boot-script rework, the Final One (tm) Maxim Yu. Osipov
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=20181126110717.0fae7592@md1za8fc.ad001.siemens.net \
--to=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
--cc=jan.kiszka@siemens.com \
--cc=lenormf@gmail.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