* see:
  https://lists.openembedded.org/g/openembedded-architecture/message/2007
  
https://git.openembedded.org/openembedded-core/commit/?id=cc4ec43a2b657fb4c58429ab14f1edc2473c1327

* fixes:
  http://errors.yoctoproject.org/Errors/Details/772685/

Signed-off-by: Martin Jansa <martin.ja...@gmail.com>
---
 ...d-allow-environmental-CGO-settings-and-pass-dont.patch | 6 +++---
 recipes-containers/cri-tools/cri-tools_git.bb             | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch
 
b/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch
index 29e0367b..5b25c7c8 100644
--- 
a/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch
+++ 
b/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch
@@ -35,10 +35,10 @@ Signed-off-by: Bruce Ashfield <bruce.ashfi...@gmail.com>
  src/import/Makefile | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-Index: 
cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351/src/import/Makefile
+Index: Makefile
 ===================================================================
---- 
cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351.orig/src/import/Makefile
-+++ 
cri-tools-1.27.0+gite73a7139ed4986d6a0db784ae7a036841a02b351/src/import/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -74,7 +74,8 @@
        @$(MAKE) -B $(CRICTL)
  
diff --git a/recipes-containers/cri-tools/cri-tools_git.bb 
b/recipes-containers/cri-tools/cri-tools_git.bb
index e0caf740..bfaacdd0 100644
--- a/recipes-containers/cri-tools/cri-tools_git.bb
+++ b/recipes-containers/cri-tools/cri-tools_git.bb
@@ -18,12 +18,12 @@ What is not in scope for this project? \
 
 SRCREV_cri-tools = "17b4dd65d660fec94d7a5a070e3e89ef640f1087"
 SRC_URI = "\
-       
git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools;protocol=https
 \
-        file://0001-build-allow-environmental-CGO-settings-and-pass-dont.patch 
\
-       "
+    
git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}
 \
+    
file://0001-build-allow-environmental-CGO-settings-and-pass-dont.patch;patchdir=src/${GO_IMPORT}/
 \
+"
 
 LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = 
"file://src/import/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
+LIC_FILES_CHKSUM = 
"file://src/${GO_IMPORT}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
 
 GO_IMPORT = "import"
 
-- 
2.45.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8763): 
https://lists.yoctoproject.org/g/meta-virtualization/message/8763
Mute This Topic: https://lists.yoctoproject.org/mt/106287817/21656
Group Owner: meta-virtualization+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to