1 files changed, 9 insertions, 19 deletions

diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-Add-build-option-GODEBUG-1.patch b/recipes-containers/containerd/containerd-opencontainers/0001-Add-build-option-GODEBUG-1.patch
index 05c4f153..8b43c8a0 100644
--- a/recipes-containers/containerd/containerd-opencontainers/0001-Add-build-option-GODEBUG-1.patch
+++ b/recipes-containers/containerd/containerd-opencontainers/0001-Add-build-option-GODEBUG-1.patch
@@ -15,28 +15,18 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
  src/import/Makefile | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/src/import/Makefile b/src/import/Makefile
-index 4355395..4fb5d3b 100644
---- a/src/import/Makefile
-+++ b/src/import/Makefile
-@@ -75,11 +75,15 @@ TEST_REQUIRES_ROOT_PACKAGES=$(filter \
+Index: git/src/import/Makefile
+===================================================================
+--- git.orig/src/import/Makefile        2020-10-12 08:09:41.638977052 -0700
++++ git/src/import/Makefile     2020-10-12 08:10:49.783074373 -0700
+@@ -72,6 +72,10 @@
  COMMANDS=ctr containerd containerd-stress
- MANPAGES=ctr.1 containerd.1 containerd-config.1 containerd-config.toml.5
+ MANPAGES=ctr.8 containerd.8 containerd-config.8 containerd-config.toml.5
  
 +ifndef GODEBUG
 +   EXTRA_LDFLAGS += -s -w
 +endif
 +
- # Build tags seccomp and apparmor are needed by CRI plugin.
- BUILDTAGS ?= seccomp apparmor
- GO_TAGS=$(if $(BUILDTAGS),-tags "$(BUILDTAGS)",)
--GO_LDFLAGS=-ldflags '-s -w -X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) $(EXTRA_LDFLAGS)'
--SHIM_GO_LDFLAGS=-ldflags '-s -w -X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) -extldflags "-static"'
-+GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) $(EXTRA_LDFLAGS)'
-+SHIM_GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) -extldflags "-static" $(EXTRA_LDFLAGS)'
- 
- #Replaces ":" (*nix), ";" (windows) with newline for easy parsing
- GOPATHS=$(shell echo ${GOPATH} | tr ":" "\n" | tr ";" "\n")
--- 
-2.7.4
-
+ ifdef BUILDTAGS
+     GO_BUILDTAGS = ${BUILDTAGS}
+ endif