From: Angelo Compagnucci <angelo@amarulasolutions.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 4/5] package/runc: converting to golang infrastructure
Date: Wed, 6 Dec 2017 11:56:56 +0100 [thread overview]
Message-ID: <1512557817-431-5-git-send-email-angelo@amarulasolutions.com> (raw)
In-Reply-To: <1512557817-431-1-git-send-email-angelo@amarulasolutions.com>
From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
This patch converts the runc package to the new golang
infrastructure.
Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
---
package/runc/runc.mk | 37 +++++--------------------------------
1 file changed, 5 insertions(+), 32 deletions(-)
diff --git a/package/runc/runc.mk b/package/runc/runc.mk
index fb3fec2..f497b6d 100644
--- a/package/runc/runc.mk
+++ b/package/runc/runc.mk
@@ -9,42 +9,15 @@ RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION))
RUNC_LICENSE = Apache-2.0
RUNC_LICENSE_FILES = LICENSE
-RUNC_DEPENDENCIES = host-go
+RUNC_GOPATH = Godeps/_workspace
-RUNC_GOPATH = "$(@D)/Godeps/_workspace"
-RUNC_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
- CGO_ENABLED=1 \
- GOBIN="$(@D)/bin" \
- GOPATH="$(RUNC_GOPATH)" \
- PATH=$(BR_PATH)
+RUNC_GO_LDFLAGS = -X main.gitCommit=$(RUNC_VERSION)
-RUNC_GLDFLAGS = \
- -X main.gitCommit=$(RUNC_VERSION)
-
-ifeq ($(BR2_STATIC_LIBS),y)
-RUNC_GLDFLAGS += -extldflags '-static'
-endif
-
-RUNC_GOTAGS = cgo static_build
+RUNC_GO_TAGS = cgo static_build
ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
-RUNC_GOTAGS += seccomp
+RUNC_GO_TAGS += seccomp
RUNC_DEPENDENCIES += libseccomp host-pkgconf
endif
-define RUNC_CONFIGURE_CMDS
- mkdir -p $(RUNC_GOPATH)/src/github.com/opencontainers
- ln -s $(@D) $(RUNC_GOPATH)/src/github.com/opencontainers/runc
-endef
-
-define RUNC_BUILD_CMDS
- cd $(@D) && $(RUNC_MAKE_ENV) $(HOST_DIR)/bin/go \
- build -v -o $(@D)/bin/runc \
- -tags "$(RUNC_GOTAGS)" -ldflags "$(RUNC_GLDFLAGS)" .
-endef
-
-define RUNC_INSTALL_TARGET_CMDS
- $(INSTALL) -D -m 0755 $(@D)/bin/runc $(TARGET_DIR)/usr/bin/runc
-endef
-
-$(eval $(generic-package))
+$(eval $(golang-package))
--
2.7.4
next prev parent reply other threads:[~2017-12-06 10:56 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-06 10:56 [Buildroot] [PATCH 0/5] New infrastructure for golang packages Angelo Compagnucci
2017-12-06 10:56 ` [Buildroot] [PATCH 1/5] package/pkg-golang: new package infrastructure Angelo Compagnucci
2017-12-06 10:56 ` [Buildroot] [PATCH 2/5] docs/manual: adding documentation for the golang infrastructure Angelo Compagnucci
2017-12-06 10:56 ` [Buildroot] [PATCH 3/5] package/flannel: converting to " Angelo Compagnucci
2017-12-06 10:56 ` Angelo Compagnucci [this message]
2017-12-06 10:56 ` [Buildroot] [PATCH 5/5] package/docker-containerd: " Angelo Compagnucci
2017-12-06 21:39 ` [Buildroot] [PATCH 0/5] New infrastructure for golang packages Arnout Vandecappelle
2017-12-06 21:59 ` Angelo Compagnucci
2017-12-06 22:33 ` Arnout Vandecappelle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1512557817-431-5-git-send-email-angelo@amarulasolutions.com \
--to=angelo@amarulasolutions.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox