* [PATCH 0/2][morty] Backport image dependency chain fixes @ 2017-02-21 18:04 Andre McCurdy 2017-02-21 18:04 ` [PATCH 1/2][morty] image_types.bbclass: IMAGE_TYPEDEP_ now adds deps for conversion types Andre McCurdy ` (2 more replies) 0 siblings, 3 replies; 7+ messages in thread From: Andre McCurdy @ 2017-02-21 18:04 UTC (permalink / raw) To: openembedded-core Andre McCurdy (1): image_types.bbclass: fix image dependency chain collection Randy Witt (1): image_types.bbclass: IMAGE_TYPEDEP_ now adds deps for conversion types meta/classes/image_types.bbclass | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) -- 1.9.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2][morty] image_types.bbclass: IMAGE_TYPEDEP_ now adds deps for conversion types 2017-02-21 18:04 [PATCH 0/2][morty] Backport image dependency chain fixes Andre McCurdy @ 2017-02-21 18:04 ` Andre McCurdy 2017-02-21 18:04 ` [PATCH 2/2][morty] image_types.bbclass: fix image dependency chain collection Andre McCurdy 2017-03-15 2:14 ` [PATCH 0/2][morty] Backport image dependency chain fixes Andre McCurdy 2 siblings, 0 replies; 7+ messages in thread From: Andre McCurdy @ 2017-02-21 18:04 UTC (permalink / raw) To: openembedded-core From: Randy Witt <randy.e.witt@linux.intel.com> Previously if IMAGE_TYPEDEP_* contained a conversion type of the form, "foo.bar", the dependency on CONVERSION_DEPENDS_bar would not get added to the task depends for do_rootfs. [YOCTO #10883] Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 037d39898e0e16c6d5b24a8d3844abfb328d3c14) --- meta/classes/image_types.bbclass | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 1ce8334..5020a5a 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -17,17 +17,25 @@ def imagetypes_getdepends(d): d += ":do_populate_sysroot" deps.add(d) + # Take a type in the form of foo.bar.car and split it into the items + # needed for the image deps "foo", and the conversion deps ["bar", "car"] + def split_types(typestring): + types = typestring.split(".") + return types[0], types[1:] + fstypes = set((d.getVar('IMAGE_FSTYPES', True) or "").split()) fstypes |= set((d.getVar('IMAGE_FSTYPES_DEBUGFS', True) or "").split()) deps = set() for typestring in fstypes: - types = typestring.split(".") - basetype, resttypes = types[0], types[1:] - + basetype, resttypes = split_types(typestring) adddep(d.getVar('IMAGE_DEPENDS_%s' % basetype, True) , deps) + for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype, True) or "").split(): + base, rest = split_types(typedepends) + resttypes += rest adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends, True) , deps) + for ctype in resttypes: adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype, True), deps) adddep(d.getVar("COMPRESS_DEPENDS_%s" % ctype, True), deps) -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2][morty] image_types.bbclass: fix image dependency chain collection 2017-02-21 18:04 [PATCH 0/2][morty] Backport image dependency chain fixes Andre McCurdy 2017-02-21 18:04 ` [PATCH 1/2][morty] image_types.bbclass: IMAGE_TYPEDEP_ now adds deps for conversion types Andre McCurdy @ 2017-02-21 18:04 ` Andre McCurdy 2017-03-15 2:14 ` [PATCH 0/2][morty] Backport image dependency chain fixes Andre McCurdy 2 siblings, 0 replies; 7+ messages in thread From: Andre McCurdy @ 2017-02-21 18:04 UTC (permalink / raw) To: openembedded-core If image type "foo" depends on image type "bar.xz", then dependencies should be collected from the base image type (ie "IMAGE_DEPENDS_bar") not from "IMAGE_DEPENDS_bar.xz". Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 8a9f249a9166347cc0468191ce130003e3d306e1) --- meta/classes/image_types.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 5020a5a..3bfa60b 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -33,8 +33,8 @@ def imagetypes_getdepends(d): for typedepends in (d.getVar("IMAGE_TYPEDEP_%s" % basetype, True) or "").split(): base, rest = split_types(typedepends) + adddep(d.getVar('IMAGE_DEPENDS_%s' % base, True) , deps) resttypes += rest - adddep(d.getVar('IMAGE_DEPENDS_%s' % typedepends, True) , deps) for ctype in resttypes: adddep(d.getVar("CONVERSION_DEPENDS_%s" % ctype, True), deps) -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2][morty] Backport image dependency chain fixes 2017-02-21 18:04 [PATCH 0/2][morty] Backport image dependency chain fixes Andre McCurdy 2017-02-21 18:04 ` [PATCH 1/2][morty] image_types.bbclass: IMAGE_TYPEDEP_ now adds deps for conversion types Andre McCurdy 2017-02-21 18:04 ` [PATCH 2/2][morty] image_types.bbclass: fix image dependency chain collection Andre McCurdy @ 2017-03-15 2:14 ` Andre McCurdy 2017-03-15 3:08 ` akuster808 2 siblings, 1 reply; 7+ messages in thread From: Andre McCurdy @ 2017-03-15 2:14 UTC (permalink / raw) To: OE Core mailing list On Tue, Feb 21, 2017 at 10:04 AM, Andre McCurdy <armccurdy@gmail.com> wrote: > Andre McCurdy (1): > image_types.bbclass: fix image dependency chain collection > > Randy Witt (1): > image_types.bbclass: IMAGE_TYPEDEP_ now adds deps for conversion types Ping (and CC'ing Armin this time...) > meta/classes/image_types.bbclass | 16 ++++++++++++---- > 1 file changed, 12 insertions(+), 4 deletions(-) > > -- > 1.9.1 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2][morty] Backport image dependency chain fixes 2017-03-15 2:14 ` [PATCH 0/2][morty] Backport image dependency chain fixes Andre McCurdy @ 2017-03-15 3:08 ` akuster808 2017-03-15 3:13 ` Andre McCurdy 0 siblings, 1 reply; 7+ messages in thread From: akuster808 @ 2017-03-15 3:08 UTC (permalink / raw) To: Andre McCurdy, OE Core mailing list On 03/14/2017 07:14 PM, Andre McCurdy wrote: > On Tue, Feb 21, 2017 at 10:04 AM, Andre McCurdy <armccurdy@gmail.com> wrote: >> Andre McCurdy (1): >> image_types.bbclass: fix image dependency chain collection >> >> Randy Witt (1): >> image_types.bbclass: IMAGE_TYPEDEP_ now adds deps for conversion types I tried applying these changes and they fail. maybe I can grabbing the wrong changes. - armin > Ping (and CC'ing Armin this time...) > >> meta/classes/image_types.bbclass | 16 ++++++++++++---- >> 1 file changed, 12 insertions(+), 4 deletions(-) >> >> -- >> 1.9.1 >> ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2][morty] Backport image dependency chain fixes 2017-03-15 3:08 ` akuster808 @ 2017-03-15 3:13 ` Andre McCurdy 2017-03-15 5:58 ` akuster808 0 siblings, 1 reply; 7+ messages in thread From: Andre McCurdy @ 2017-03-15 3:13 UTC (permalink / raw) To: akuster808; +Cc: OE Core mailing list On Tue, Mar 14, 2017 at 8:08 PM, akuster808 <akuster808@gmail.com> wrote: > On 03/14/2017 07:14 PM, Andre McCurdy wrote: >> >> On Tue, Feb 21, 2017 at 10:04 AM, Andre McCurdy <armccurdy@gmail.com> >> wrote: >>> >>> Andre McCurdy (1): >>> image_types.bbclass: fix image dependency chain collection >>> >>> Randy Witt (1): >>> image_types.bbclass: IMAGE_TYPEDEP_ now adds deps for conversion types > > I tried applying these changes and they fail. maybe I can grabbing the wrong > changes. You can't cherry-pick the original commits directly from master due to missing getVar() True's. The patches sent to the list were manually fixed up to apply correctly though. > - armin > > > >> Ping (and CC'ing Armin this time...) > > >> >>> meta/classes/image_types.bbclass | 16 ++++++++++++---- >>> 1 file changed, 12 insertions(+), 4 deletions(-) >>> >>> -- >>> 1.9.1 >>> > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2][morty] Backport image dependency chain fixes 2017-03-15 3:13 ` Andre McCurdy @ 2017-03-15 5:58 ` akuster808 0 siblings, 0 replies; 7+ messages in thread From: akuster808 @ 2017-03-15 5:58 UTC (permalink / raw) To: Andre McCurdy; +Cc: OE Core mailing list On 03/14/2017 08:13 PM, Andre McCurdy wrote: > On Tue, Mar 14, 2017 at 8:08 PM, akuster808 <akuster808@gmail.com> wrote: >> On 03/14/2017 07:14 PM, Andre McCurdy wrote: >>> On Tue, Feb 21, 2017 at 10:04 AM, Andre McCurdy <armccurdy@gmail.com> >>> wrote: >>>> Andre McCurdy (1): >>>> image_types.bbclass: fix image dependency chain collection >>>> >>>> Randy Witt (1): >>>> image_types.bbclass: IMAGE_TYPEDEP_ now adds deps for conversion types >> I tried applying these changes and they fail. maybe I can grabbing the wrong >> changes. > You can't cherry-pick the original commits directly from master due to > missing getVar() True's. The patches sent to the list were manually > fixed up to apply correctly though. ok. found them thank. they apply fine. will be in stagging soon - armin > >> - armin >> >> >> >>> Ping (and CC'ing Armin this time...) >> >>>> meta/classes/image_types.bbclass | 16 ++++++++++++---- >>>> 1 file changed, 12 insertions(+), 4 deletions(-) >>>> >>>> -- >>>> 1.9.1 >>>> ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-03-15 5:58 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-02-21 18:04 [PATCH 0/2][morty] Backport image dependency chain fixes Andre McCurdy 2017-02-21 18:04 ` [PATCH 1/2][morty] image_types.bbclass: IMAGE_TYPEDEP_ now adds deps for conversion types Andre McCurdy 2017-02-21 18:04 ` [PATCH 2/2][morty] image_types.bbclass: fix image dependency chain collection Andre McCurdy 2017-03-15 2:14 ` [PATCH 0/2][morty] Backport image dependency chain fixes Andre McCurdy 2017-03-15 3:08 ` akuster808 2017-03-15 3:13 ` Andre McCurdy 2017-03-15 5:58 ` akuster808
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.