MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 12:50:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

containerd-opencontainers: building unstripped binaries

Browse Source 
It defaults to "-s -w" [1] which strips debug information, refresh a backported
patch to build unstripped binaries

https://golang.org/cmd/link/

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Hongxu Jia 2019-09-02 16:36:49 +08:00 committed by Bruce Ashfield
parent f8568abe01
commit 4846ff50ea
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
recipes-containers/containerd/containerd-opencontainers/0001-Add-build-option-GODEBUG-1.patch Normal file
View File

@ -0,0 +1,42 @@
From 84874e47aa2025b8e73df0286c44f3b8a1d9fdb2 Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Mon, 2 Sep 2019 16:20:07 +0800
Subject: [PATCH] Add build option "GODEBUG=1"
Make will generate GDB friendly binary with this build option.
Signed-off-by: Hui Zhu <teawater@hyper.sh>
Upstream-Status: Backport [c5a0c7f491b435e4eb45972903b00e2d8ed46495]
Partly backport and refresh to v1.2.7
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 \
COMMANDS=ctr containerd containerd-stress
MANPAGES=ctr.1 containerd.1 containerd-config.1 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

3
recipes-containers/containerd/containerd-opencontainers_git.bb
View File

@ -1,6 +1,7 @@
SRCREV = "fd103cb716352c7e19768e4fed057f71d68902a0"
SRC_URI = "git://github.com/containerd/containerd;branch=release/1.2 \
file://0001-build-use-oe-provided-GO-and-flags.patch \
file://0001-Add-build-option-GODEBUG-1.patch \
"
include containerd.inc
@ -9,5 +10,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d
CONTAINERD_VERSION = "v1.2.7"
EXTRA_OEMAKE += "GODEBUG=1"
PROVIDES += "virtual/containerd"
RPROVIDES_${PN} = "virtual/containerd"