[PATCH] vulkan-headers: Fix upstream branch deletion issue

Openembedded Core Discussions
 help / color / mirror / Atom feed

* [PATCH] vulkan-headers: Fix upstream branch deletion issue
@ 2020-06-23 13:41 Richard Purdie
  2020-06-23 14:02 ` ✗ patchtest: failure for " Patchwork
  2020-06-23 19:46 ` [OE-core] [PATCH] " Khem Raj
  0 siblings, 2 replies; 6+ messages in thread
From: Richard Purdie @ 2020-06-23 13:41 UTC (permalink / raw)
  To: openembedded-core

The upstream branch was deleted but the commit is in master so reference
that instead.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
index 54cee96cce0..d21c3d62b90 100644
--- a/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
@@ -5,7 +5,8 @@ SECTION = "libs"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=sdk-1.2.135"
+# was sdk-1.2.135 branch but it was removed upstream, commit is in master branch though
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=master"
 
 SRCREV = "fb7f9c9bcd1d1544ea203a1f3d4253d0e90c5a90"
 
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* ✗ patchtest: failure for vulkan-headers: Fix upstream branch deletion issue
  2020-06-23 13:41 [PATCH] vulkan-headers: Fix upstream branch deletion issue Richard Purdie
@ 2020-06-23 14:02 ` Patchwork
  2020-06-23 19:46 ` [OE-core] [PATCH] " Khem Raj
  1 sibling, 0 replies; 6+ messages in thread
From: Patchwork @ 2020-06-23 14:02 UTC (permalink / raw)
  To: Richard Purdie; +Cc: openembedded-core

== Series Details ==

Series: vulkan-headers: Fix upstream branch deletion issue
Revision: 1
URL   : https://patchwork.openembedded.org/series/24805/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:

* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at 4e0f64cba6)

If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [OE-core] [PATCH] vulkan-headers: Fix upstream branch deletion issue
  2020-06-23 13:41 [PATCH] vulkan-headers: Fix upstream branch deletion issue Richard Purdie
  2020-06-23 14:02 ` ✗ patchtest: failure for " Patchwork
@ 2020-06-23 19:46 ` Khem Raj
  2020-06-23 20:13   ` Alexander Kanavin
  1 sibling, 1 reply; 6+ messages in thread
From: Khem Raj @ 2020-06-23 19:46 UTC (permalink / raw)
  To: Richard Purdie, openembedded-core



On 6/23/20 6:41 AM, Richard Purdie wrote:
> The upstream branch was deleted but the commit is in master so reference
> that instead.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>   meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
> index 54cee96cce0..d21c3d62b90 100644
> --- a/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
> +++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
> @@ -5,7 +5,8 @@ SECTION = "libs"
>   
>   LICENSE = "Apache-2.0"
>   LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
> -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=sdk-1.2.135"
> +# was sdk-1.2.135 branch but it was removed upstream, commit is in master branch though
> +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=master"
>   

perhaps better to update to SHA of latest tag ?
https://github.com/KhronosGroup/Vulkan-Headers/releases/tag/v1.2.145

>   SRCREV = "fb7f9c9bcd1d1544ea203a1f3d4253d0e90c5a90"
>   
> 
> 
> 
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [OE-core] [PATCH] vulkan-headers: Fix upstream branch deletion issue
  2020-06-23 19:46 ` [OE-core] [PATCH] " Khem Raj
@ 2020-06-23 20:13   ` Alexander Kanavin
  2020-06-23 20:17     ` Khem Raj
  0 siblings, 1 reply; 6+ messages in thread
From: Alexander Kanavin @ 2020-06-23 20:13 UTC (permalink / raw)
  To: Khem Raj; +Cc: Richard Purdie, OE-core

[-- Attachment #1: Type: text/plain, Size: 1515 bytes --]

Latest released gstreamer will fail to build with the latest vulkan, so we
have to defer that.

Alex

On Tue, 23 Jun 2020 at 21:46, Khem Raj <raj.khem@gmail.com> wrote:

>
>
> On 6/23/20 6:41 AM, Richard Purdie wrote:
> > The upstream branch was deleted but the commit is in master so reference
> > that instead.
> >
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> >   meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb | 3 ++-
> >   1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
> b/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
> > index 54cee96cce0..d21c3d62b90 100644
> > --- a/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
> > +++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
> > @@ -5,7 +5,8 @@ SECTION = "libs"
> >
> >   LICENSE = "Apache-2.0"
> >   LIC_FILES_CHKSUM =
> "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
> > -SRC_URI = "git://
> github.com/KhronosGroup/Vulkan-Headers.git;branch=sdk-1.2.135"
> > +# was sdk-1.2.135 branch but it was removed upstream, commit is in
> master branch though
> > +SRC_URI = "git://
> github.com/KhronosGroup/Vulkan-Headers.git;branch=master"
> >
>
> perhaps better to update to SHA of latest tag ?
> https://github.com/KhronosGroup/Vulkan-Headers/releases/tag/v1.2.145
>
> >   SRCREV = "fb7f9c9bcd1d1544ea203a1f3d4253d0e90c5a90"
> >
> >
> >
> >
> >
> 
>

[-- Attachment #2: Type: text/html, Size: 2877 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [OE-core] [PATCH] vulkan-headers: Fix upstream branch deletion issue
  2020-06-23 20:13   ` Alexander Kanavin
@ 2020-06-23 20:17     ` Khem Raj
  2020-06-23 20:32       ` Alexander Kanavin
  0 siblings, 1 reply; 6+ messages in thread
From: Khem Raj @ 2020-06-23 20:17 UTC (permalink / raw)
  To: Alexander Kanavin; +Cc: Richard Purdie, OE-core



On 6/23/20 1:13 PM, Alexander Kanavin wrote:
> Latest released gstreamer will fail to build with the latest vulkan, so 
> we have to defer that.

I see, what errors do we get ?

> 
> Alex
> 
> On Tue, 23 Jun 2020 at 21:46, Khem Raj <raj.khem@gmail.com 
> <mailto:raj.khem@gmail.com>> wrote:
> 
> 
> 
>     On 6/23/20 6:41 AM, Richard Purdie wrote:
>      > The upstream branch was deleted but the commit is in master so
>     reference
>      > that instead.
>      >
>      > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org
>     <mailto:richard.purdie@linuxfoundation.org>>
>      > ---
>      >   meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
>     <http://vulkan-headers_1.2.135.0.bb> | 3 ++-
>      >   1 file changed, 2 insertions(+), 1 deletion(-)
>      >
>      > diff --git
>     a/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
>     <http://vulkan-headers_1.2.135.0.bb>
>     b/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
>     <http://vulkan-headers_1.2.135.0.bb>
>      > index 54cee96cce0..d21c3d62b90 100644
>      > --- a/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
>     <http://vulkan-headers_1.2.135.0.bb>
>      > +++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
>     <http://vulkan-headers_1.2.135.0.bb>
>      > @@ -5,7 +5,8 @@ SECTION = "libs"
>      >
>      >   LICENSE = "Apache-2.0"
>      >   LIC_FILES_CHKSUM =
>     "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
>      > -SRC_URI =
>     "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=sdk-1.2.135
>     <http://github.com/KhronosGroup/Vulkan-Headers.git;branch=sdk-1.2.135>"
>      > +# was sdk-1.2.135 branch but it was removed upstream, commit is
>     in master branch though
>      > +SRC_URI =
>     "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=master
>     <http://github.com/KhronosGroup/Vulkan-Headers.git;branch=master>"
>      >
> 
>     perhaps better to update to SHA of latest tag ?
>     https://github.com/KhronosGroup/Vulkan-Headers/releases/tag/v1.2.145
> 
>      >   SRCREV = "fb7f9c9bcd1d1544ea203a1f3d4253d0e90c5a90"
>      >
>      >
>      >
>      >
>      >
>     
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [OE-core] [PATCH] vulkan-headers: Fix upstream branch deletion issue
  2020-06-23 20:17     ` Khem Raj
@ 2020-06-23 20:32       ` Alexander Kanavin
  0 siblings, 0 replies; 6+ messages in thread
From: Alexander Kanavin @ 2020-06-23 20:32 UTC (permalink / raw)
  To: Khem Raj; +Cc: Richard Purdie, OE-core

[-- Attachment #1: Type: text/plain, Size: 2546 bytes --]

https://autobuilder.yoctoproject.org/typhoon/#/builders/37/builds/2062/steps/8/logs/step1b

Alex

On Tue, 23 Jun 2020 at 22:17, Khem Raj <raj.khem@gmail.com> wrote:

>
>
> On 6/23/20 1:13 PM, Alexander Kanavin wrote:
> > Latest released gstreamer will fail to build with the latest vulkan, so
> > we have to defer that.
>
> I see, what errors do we get ?
>
> >
> > Alex
> >
> > On Tue, 23 Jun 2020 at 21:46, Khem Raj <raj.khem@gmail.com
> > <mailto:raj.khem@gmail.com>> wrote:
> >
> >
> >
> >     On 6/23/20 6:41 AM, Richard Purdie wrote:
> >      > The upstream branch was deleted but the commit is in master so
> >     reference
> >      > that instead.
> >      >
> >      > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org
> >     <mailto:richard.purdie@linuxfoundation.org>>
> >      > ---
> >      >   meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
> >     <http://vulkan-headers_1.2.135.0.bb> | 3 ++-
> >      >   1 file changed, 2 insertions(+), 1 deletion(-)
> >      >
> >      > diff --git
> >     a/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
> >     <http://vulkan-headers_1.2.135.0.bb>
> >     b/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
> >     <http://vulkan-headers_1.2.135.0.bb>
> >      > index 54cee96cce0..d21c3d62b90 100644
> >      > --- a/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
> >     <http://vulkan-headers_1.2.135.0.bb>
> >      > +++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.2.135.0.bb
> >     <http://vulkan-headers_1.2.135.0.bb>
> >      > @@ -5,7 +5,8 @@ SECTION = "libs"
> >      >
> >      >   LICENSE = "Apache-2.0"
> >      >   LIC_FILES_CHKSUM =
> >     "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
> >      > -SRC_URI =
> >     "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=sdk-1.2.135
> >     <
> http://github.com/KhronosGroup/Vulkan-Headers.git;branch=sdk-1.2.135>"
> >      > +# was sdk-1.2.135 branch but it was removed upstream, commit is
> >     in master branch though
> >      > +SRC_URI =
> >     "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=master
> >     <http://github.com/KhronosGroup/Vulkan-Headers.git;branch=master>"
> >      >
> >
> >     perhaps better to update to SHA of latest tag ?
> >     https://github.com/KhronosGroup/Vulkan-Headers/releases/tag/v1.2.145
> >
> >      >   SRCREV = "fb7f9c9bcd1d1544ea203a1f3d4253d0e90c5a90"
> >      >
> >      >
> >      >
> >      >
> >      >
> >     
> >
>

[-- Attachment #2: Type: text/html, Size: 5266 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-06-23 20:32 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-23 13:41 [PATCH] vulkan-headers: Fix upstream branch deletion issue Richard Purdie
2020-06-23 14:02 ` ✗ patchtest: failure for " Patchwork
2020-06-23 19:46 ` [OE-core] [PATCH] " Khem Raj
2020-06-23 20:13   ` Alexander Kanavin
2020-06-23 20:17     ` Khem Raj
2020-06-23 20:32       ` Alexander Kanavin

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox