* 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/772687/ Signed-off-by: Martin Jansa <martin.ja...@gmail.com> --- ...w-external-specification-of-build-setti.patch | 16 ++++++++-------- recipes-containers/nerdctl/nerdctl_git.bb | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch b/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch index ca7b3042..62338d0f 100644 --- a/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch +++ b/recipes-containers/nerdctl/nerdctl/0001-Makefile-allow-external-specification-of-build-setti.patch @@ -1,4 +1,4 @@ -From 0e6809ea075acd3edf7de197cd4e190ccdad6361 Mon Sep 17 00:00:00 2001 +From c624d3aab602242df017f6d4c065ff709e712bab Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfi...@gmail.com> Date: Mon, 29 Mar 2021 20:50:47 -0400 Subject: [PATCH] Makefile: allow external specification of build settings @@ -7,14 +7,14 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Bruce Ashfield <bruce.ashfi...@gmail.com> --- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: nerdctl-v2.0.0-beta.1/src/import/Makefile -=================================================================== ---- nerdctl-v2.0.0-beta.1.orig/src/import/Makefile -+++ nerdctl-v2.0.0-beta.1/src/import/Makefile -@@ -38,7 +38,7 @@ +diff --git a/Makefile b/Makefile +index 844ae721..f5b90d84 100644 +--- a/Makefile ++++ b/Makefile +@@ -38,7 +38,7 @@ REVISION ?= $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --qui GO_BUILD_LDFLAGS ?= -s -w GO_BUILD_FLAGS ?= diff --git a/recipes-containers/nerdctl/nerdctl_git.bb b/recipes-containers/nerdctl/nerdctl_git.bb index 8868274f..9343309c 100644 --- a/recipes-containers/nerdctl/nerdctl_git.bb +++ b/recipes-containers/nerdctl/nerdctl_git.bb @@ -13,12 +13,12 @@ DEPENDS = " \ SRCREV_FORMAT="nerdcli_cgroups" SRCREV_nerdcli = "265d6b9cf526ce7d9ed8d34a0e3c3066901cc463" -SRC_URI = "git://github.com/containerd/nerdctl.git;name=nerdcli;branch=main;protocol=https" +SRC_URI = "git://github.com/containerd/nerdctl.git;name=nerdcli;branch=main;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" include src_uri.inc # patches and config -SRC_URI += "file://0001-Makefile-allow-external-specification-of-build-setti.patch \ +SRC_URI += "file://0001-Makefile-allow-external-specification-of-build-setti.patch;patchdir=src/${GO_IMPORT} \ file://modules.txt \ " -- 2.45.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8762): https://lists.yoctoproject.org/g/meta-virtualization/message/8762 Mute This Topic: https://lists.yoctoproject.org/mt/106287814/21656 Group Owner: meta-virtualization+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
