2 files changed, 18 insertions, 11 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..cf7037f3 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
@@ -6,20 +6,26 @@ Subject: [PATCH] Makefile: allow external specification of build settings
 Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+
+Rebase to v2.0.2
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
- Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ src/import/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/src/import/Makefile b/src/import/Makefile
+index ae4e18c..eb22f9f 100644
+--- a/src/import/Makefile
++++ b/src/import/Makefile
+@@ -45,7 +45,7 @@ endif
  
  GO_BUILD_LDFLAGS ?= -s -w
  GO_BUILD_FLAGS ?=
--export GO_BUILD=GO111MODULE=on CGO_ENABLED=0 GOOS=$(GOOS) $(GO) build -ldflags "$(GO_BUILD_LDFLAGS) -X $(PACKAGE)/pkg/version.Version=$(VERSION) -X $(PACKAGE)/pkg/version.Revision=$(REVISION)"
-+export GO_BUILD=$(GO) build -ldflags "$(GO_BUILD_LDFLAGS) -X $(PACKAGE)/pkg/version.Version=$(VERSION) -X $(PACKAGE)/pkg/version.Revision=$(REVISION)"
+-export GO_BUILD=CGO_ENABLED=0 GOOS=$(GOOS) $(GO) -C $(MAKEFILE_DIR) build -ldflags "$(GO_BUILD_LDFLAGS) $(VERBOSE_FLAG) -X $(PACKAGE)/pkg/version.Version=$(VERSION) -X $(PACKAGE)/pkg/version.Revision=$(REVISION)"
++export GO_BUILD=GOOS=$(GOOS) $(GO) -C $(MAKEFILE_DIR) build -ldflags "$(GO_BUILD_LDFLAGS) $(VERBOSE_FLAG) -X $(PACKAGE)/pkg/version.Version=$(VERSION) -X $(PACKAGE)/pkg/version.Revision=$(REVISION)"
+ 
+ recursive_wildcard=$(wildcard $1$2) $(foreach e,$(wildcard $1*),$(call recursive_wildcard,$e/,$2))
  
- ifdef VERBOSE
-        VERBOSE_FLAG := -v
+-- 
+2.34.1
+
diff --git a/recipes-containers/nerdctl/nerdctl_git.bb b/recipes-containers/nerdctl/nerdctl_git.bb
index 63b96846..84734c9f 100644
--- a/recipes-containers/nerdctl/nerdctl_git.bb
+++ b/recipes-containers/nerdctl/nerdctl_git.bb
@@ -19,6 +19,7 @@ include src_uri.inc
 
 # patches and config
 SRC_URI += " \
+            file://0001-Makefile-allow-external-specification-of-build-setti.patch \
             file://modules.txt \
            "