The linkshared is not supported in some machines like riscv64 and when supported we can use the GO_LINKSHARED instaed. So export GO_LINKSHARED on the recipe to be available for Makafile.
Signed-off-by: Jose Quaresma <[email protected]> --- recipes-containers/docker/docker-ce_git.bb | 3 +++ .../docker/files/0001-libnetwork-use-GO-instead-of-go.patch | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb index b36ac0d..f010648 100644 --- a/recipes-containers/docker/docker-ce_git.bb +++ b/recipes-containers/docker/docker-ce_git.bb @@ -55,3 +55,6 @@ DOCKER_VERSION = "20.10.17-ce" PV = "${DOCKER_VERSION}+git${SRCREV_docker}" CVE_PRODUCT = "docker" + +# to be used in the Makefile +export GO_LINKSHARED diff --git a/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch b/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch index d4f84e3..b9b41de 100644 --- a/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch +++ b/recipes-containers/docker/files/0001-libnetwork-use-GO-instead-of-go.patch @@ -34,8 +34,8 @@ Index: git/libnetwork/Makefile @echo "🐳 $@" - go build -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet - go build -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy -+ @$(GO) build -trimpath -linkshared $(GOBUILDFLAGS) -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy -+ @$(GO) build -trimpath -linkshared $(GOBUILDFLAGS) -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet ++ @$(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o "bin/docker-proxy-$$GOOS-$$GOARCH" ./cmd/proxy ++ @$(GO) build -trimpath $(GO_LINKSHARED) $(GOBUILDFLAGS) -o "bin/dnet-$$GOOS-$$GOARCH" ./cmd/dnet # Rebuild protocol buffers. # These may need to be rebuilt after vendoring updates, so .proto files are declared .PHONY so they are always rebuilt. -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7621): https://lists.yoctoproject.org/g/meta-virtualization/message/7621 Mute This Topic: https://lists.yoctoproject.org/mt/93801294/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
