| Message ID | 20250402071017.2157620-45-richard.purdie@linuxfoundation.org |
|---|---|
| State | Accepted, archived |
| Commit | 6126b2693865acdbb08f47a28fe097a2cb659573 |
| Headers | show |
| Series | [01/48] at-spi2-core: upgrade 2.56.0 -> 2.56.1 | expand |
On Wed Apr 2, 2025 at 9:10 AM CEST, Richard Purdie via lists.openembedded.org wrote: > Add tag to SRC_URI to verify SRCREV. > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > --- Hi Richard, It looks like we have a revision error: ERROR: shaderc-native-2025.1-r0 do_unpack: Bitbake Fetcher Error: FetchError("The revision the git tag 'v2025.1' resolved to didn't match the SRCREV in use (0968768c61d4eb7dd861114412e904bb3d59b7b6 vs 7f68b1cf6f35f518febf36d425365bb8e6ad224a)", 'git://github.com/google/shaderc.git;protocol=https;branch=main;tag=v2025.1') Appears in a lot of builders: https://autobuilder.yoctoproject.org/valkyrie/#/builders/2/builds/1322 https://autobuilder.yoctoproject.org/valkyrie/#/builders/3/builds/1360 https://autobuilder.yoctoproject.org/valkyrie/#/builders/4/builds/1321 https://autobuilder.yoctoproject.org/valkyrie/#/builders/6/builds/1336 https://autobuilder.yoctoproject.org/valkyrie/#/builders/9/builds/1298 ...
On Wed, 2025-04-02 at 15:45 +0200, Mathieu Dubois-Briand wrote: > On Wed Apr 2, 2025 at 9:10 AM CEST, Richard Purdie via > lists.openembedded.org wrote: > > Add tag to SRC_URI to verify SRCREV. > > > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > > --- > > Hi Richard, > > It looks like we have a revision error: > > ERROR: shaderc-native-2025.1-r0 do_unpack: Bitbake Fetcher Error: > FetchError("The revision the git tag 'v2025.1' resolved to didn't > match the SRCREV in use (0968768c61d4eb7dd861114412e904bb3d59b7b6 vs > 7f68b1cf6f35f518febf36d425365bb8e6ad224a)", > 'git://github.com/google/shaderc.git;protocol=https;branch=main;tag=v > 2025.1') > > Appears in a lot of builders: > > https://autobuilder.yoctoproject.org/valkyrie/#/builders/2/builds/1322 > https://autobuilder.yoctoproject.org/valkyrie/#/builders/3/builds/1360 > https://autobuilder.yoctoproject.org/valkyrie/#/builders/4/builds/1321 > https://autobuilder.yoctoproject.org/valkyrie/#/builders/6/builds/1336 > https://autobuilder.yoctoproject.org/valkyrie/#/builders/9/builds/1298 > ... You need a bitbake change for this. I have it in my branch and I was testing it after finding this issue. I'll get it posted as it seems to work. Cheers, Richard
diff --git a/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch b/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch index 5c49aa7fd5a..07765653bbc 100644 --- a/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch +++ b/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch @@ -1,4 +1,4 @@ -From 941f5f5831e7a52c26168f81f25d0470860ca6f1 Mon Sep 17 00:00:00 2001 +From ed0e2fad08a3cd3f0a0c70922737d8a6886f484d Mon Sep 17 00:00:00 2001 From: Jose Quaresma <quaresma.jose@gmail.com> Date: Sat, 13 Feb 2021 00:45:56 +0000 Subject: [PATCH] cmake: disable building external dependencies @@ -15,7 +15,7 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index ffcb54b..cce715e 100644 +index bd6b890..f1ddd74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,6 +62,7 @@ else() diff --git a/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch b/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch index 39f982b7f3d..429b53c308c 100644 --- a/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch +++ b/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch @@ -1,4 +1,4 @@ -From ec2442940e1d5338971861bb81537bae3a6c19e2 Mon Sep 17 00:00:00 2001 +From 4797642a6394ad7e5a23aaa3bdf8e2d011f69adf Mon Sep 17 00:00:00 2001 From: Jose Quaresma <quaresma.jose@gmail.com> Date: Sat, 13 Feb 2021 00:45:56 +0000 Subject: [PATCH] libshaderc_util: fix glslang header file location @@ -11,7 +11,7 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc -index e5f5d10..5fd6d3c 100644 +index 9bf9a43..dc0efd2 100644 --- a/libshaderc_util/src/compiler.cc +++ b/libshaderc_util/src/compiler.cc @@ -20,7 +20,7 @@ diff --git a/meta/recipes-graphics/shaderc/shaderc_2024.3.bb b/meta/recipes-graphics/shaderc/shaderc_2025.1.bb similarity index 93% rename from meta/recipes-graphics/shaderc/shaderc_2024.3.bb rename to meta/recipes-graphics/shaderc/shaderc_2025.1.bb index 0948ba28d6a..e9c0ecdd373 100644 --- a/meta/recipes-graphics/shaderc/shaderc_2024.3.bb +++ b/meta/recipes-graphics/shaderc/shaderc_2025.1.bb @@ -6,8 +6,8 @@ HOMEPAGE = "https://github.com/google/shaderc" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "7223dc3d5e34bbcc44f3150546dbfa8a5da58c4c" -SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ +SRCREV = "7f68b1cf6f35f518febf36d425365bb8e6ad224a" +SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main;tag=v${PV} \ file://0001-cmake-disable-building-external-dependencies.patch \ file://0002-libshaderc_util-fix-glslang-header-file-location.patch \ "
Add tag to SRC_URI to verify SRCREV. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- .../0001-cmake-disable-building-external-dependencies.patch | 4 ++-- ...002-libshaderc_util-fix-glslang-header-file-location.patch | 4 ++-- .../shaderc/{shaderc_2024.3.bb => shaderc_2025.1.bb} | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename meta/recipes-graphics/shaderc/{shaderc_2024.3.bb => shaderc_2025.1.bb} (93%)