[meta-oe][PATCH] catch2: upgrade to 2.13.4

[meta-oe][PATCH] catch2: upgrade to 2.13.4

[Patrick Williams]

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
---
 .../recipes-test/catch2/{catch2_2.9.2.bb => catch2_2.13.4.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-test/catch2/{catch2_2.9.2.bb => catch2_2.13.4.bb} (84%)

diff --git a/meta-oe/recipes-test/catch2/catch2_2.9.2.bb b/meta-oe/recipes-test/catch2/catch2_2.13.4.bb
similarity index 84%
rename from meta-oe/recipes-test/catch2/catch2_2.9.2.bb
rename to meta-oe/recipes-test/catch2/catch2_2.13.4.bb
index 57fc935f77..512c00681f 100644
--- a/meta-oe/recipes-test/catch2/catch2_2.9.2.bb
+++ b/meta-oe/recipes-test/catch2/catch2_2.13.4.bb
@@ -5,8 +5,8 @@ HOMEPAGE = "https://github.com/catchorg/Catch2"
 LICENSE = "BSL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
 
-SRC_URI = "git://github.com/catchorg/Catch2.git"
-SRCREV = "2c869e17e4803d30b3d5ca5b0d76387b9db97fa5"
+SRC_URI = "git://github.com/catchorg/Catch2.git;nobranch=1"
+SRCREV = "de6fe184a9ac1a06895cdd1c9b437f0a0bdf14ad"
 
 S = "${WORKDIR}/git"
 
-- 
2.26.2

Re: [OE-core] [meta-oe][PATCH] catch2: upgrade to 2.13.4

[Konrad Weihmann]

On 16.02.21 14:43, Patrick Williams wrote:
> Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
> ---
>   .../recipes-test/catch2/{catch2_2.9.2.bb => catch2_2.13.4.bb} | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>   rename meta-oe/recipes-test/catch2/{catch2_2.9.2.bb => catch2_2.13.4.bb} (84%)
> 
> diff --git a/meta-oe/recipes-test/catch2/catch2_2.9.2.bb b/meta-oe/recipes-test/catch2/catch2_2.13.4.bb
> similarity index 84%
> rename from meta-oe/recipes-test/catch2/catch2_2.9.2.bb
> rename to meta-oe/recipes-test/catch2/catch2_2.13.4.bb
> index 57fc935f77..512c00681f 100644
> --- a/meta-oe/recipes-test/catch2/catch2_2.9.2.bb
> +++ b/meta-oe/recipes-test/catch2/catch2_2.13.4.bb
> @@ -5,8 +5,8 @@ HOMEPAGE = "https://github.com/catchorg/Catch2"
>   LICENSE = "BSL-1.0"
>   LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
>   
> -SRC_URI = "git://github.com/catchorg/Catch2.git"
> -SRCREV = "2c869e17e4803d30b3d5ca5b0d76387b9db97fa5"
> +SRC_URI = "git://github.com/catchorg/Catch2.git;nobranch=1"

Wrong mailing list I suppose - this should go to 
openembedded-devel@lists.openembedded.org - and on a second note I don't 
think using nobranch is a good idea - the branch used "v2.x" or is there 
any reason for this which isn't that obvious?

> +SRCREV = "de6fe184a9ac1a06895cdd1c9b437f0a0bdf14ad"
>   
>   S = "${WORKDIR}/git"
>   
> 
> 
> 
> 
> 

Re: [OE-core] [meta-oe][PATCH] catch2: upgrade to 2.13.4

[Patrick Williams]

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

On Tue, Feb 16, 2021 at 03:03:33PM +0100, Konrad Weihmann wrote:
> On 16.02.21 14:43, Patrick Williams wrote:
  
> > -SRC_URI = "git://github.com/catchorg/Catch2.git"
> > -SRCREV = "2c869e17e4803d30b3d5ca5b0d76387b9db97fa5"
> > +SRC_URI = "git://github.com/catchorg/Catch2.git;nobranch=1"
> 
> Wrong mailing list I suppose - this should go to 
> openembedded-devel@lists.openembedded.org 

Oh, sorry.  I was following:
    https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded

> and on a second note I don't 
> think using nobranch is a good idea - the branch used "v2.x" or is there 
> any reason for this which isn't that obvious?

Let me try 'branch=v2.x'.  `fetch` failed when I left it as default so I
didn't investigate a whole lot more and just used 'nobranch=1' because
that was the first thing that came to mind.  It does look like the
v2.13.4 tag is along the v2.x branch, so that'll probably work.

> 
> > +SRCREV = "de6fe184a9ac1a06895cdd1c9b437f0a0bdf14ad"
> >   
-- 
Patrick Williams

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 849 bytes --]

[meta-oe][PATCH] catch2: upgrade to 2.13.4

[Patrick Williams]

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
---
 .../recipes-test/catch2/{catch2_2.9.2.bb => catch2_2.13.4.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-test/catch2/{catch2_2.9.2.bb => catch2_2.13.4.bb} (84%)

diff --git a/meta-oe/recipes-test/catch2/catch2_2.9.2.bb b/meta-oe/recipes-test/catch2/catch2_2.13.4.bb
similarity index 84%
rename from meta-oe/recipes-test/catch2/catch2_2.9.2.bb
rename to meta-oe/recipes-test/catch2/catch2_2.13.4.bb
index 57fc935f77..21004726a2 100644
--- a/meta-oe/recipes-test/catch2/catch2_2.9.2.bb
+++ b/meta-oe/recipes-test/catch2/catch2_2.13.4.bb
@@ -5,8 +5,8 @@ HOMEPAGE = "https://github.com/catchorg/Catch2"
 LICENSE = "BSL-1.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
 
-SRC_URI = "git://github.com/catchorg/Catch2.git"
-SRCREV = "2c869e17e4803d30b3d5ca5b0d76387b9db97fa5"
+SRC_URI = "git://github.com/catchorg/Catch2.git;branch=v2.x"
+SRCREV = "de6fe184a9ac1a06895cdd1c9b437f0a0bdf14ad"
 
 S = "${WORKDIR}/git"
 
-- 
2.26.2