From 2b0e119d5ce4106e78c214babfc1c6fe02f636b2 Mon Sep 17 00:00:00 2001 From: hongxu Date: Mon, 10 Feb 2025 15:46:58 +0800 Subject: nerdctl: fix do_compile failed Using latest poky + meta-virtualization + meta-openembedded, build multlib failed ...local.conf... MACHINE = "qemux86-64" require conf/multilib.conf MULTILIBS = "multilib:lib32" DEFAULTTUNE:virtclass-multilib-lib32 = "x86" $ bitbake lib32-nerdctl ... -buildmode=pie requires external (cgo) linking, but cgo is not enabled make: *** [Makefile:63: nerdctl] Error 1 ... Get back the patch to allow external specification of build settings and rebase to v2.0.2 Signed-off-by: Hongxu Jia Signed-off-by: Bruce Ashfield --- ...low-external-specification-of-build-setti.patch | 28 +++++++++++++--------- recipes-containers/nerdctl/nerdctl_git.bb | 1 + 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 + +Rebase to v2.0.2 +Signed-off-by: Hongxu Jia --- - 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 \ " -- cgit v1.2.3-54-g00ecf