From: Angelo Compagnucci <angelo.compagnucci@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [RFC v4 3/4] package/flannel: converting to golang infrastructure
Date: Tue, 24 Oct 2017 23:14:31 +0200 [thread overview]
Message-ID: <1508879672-12957-3-git-send-email-angelo.compagnucci@gmail.com> (raw)
In-Reply-To: <1508879672-12957-1-git-send-email-angelo.compagnucci@gmail.com>
This patch converts the flannel package to the new golang
infrastructure.
Signed-off-by: Angelo Compagnucci <angelo.compagnucci@gmail.com>
---
package/flannel/flannel.mk | 32 ++++----------------------------
1 file changed, 4 insertions(+), 28 deletions(-)
diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk
index bbb2c72..6c9d9dd 100644
--- a/package/flannel/flannel.mk
+++ b/package/flannel/flannel.mk
@@ -11,36 +11,12 @@ FLANNEL_SOURCE = $(FLANNEL_VERSION).tar.gz
FLANNEL_LICENSE = Apache-2.0
FLANNEL_LICENSE_FILES = LICENSE
-FLANNEL_DEPENDENCIES = host-go
-
-FLANNEL_MAKE_ENV = \
- $(HOST_GO_TARGET_ENV) \
- GOBIN="$(@D)/bin" \
- GOPATH="$(@D)/gopath" \
- CGO_ENABLED=1
-
-FLANNEL_GLDFLAGS = \
- -X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION)
-
-ifeq ($(BR2_STATIC_LIBS),y)
-FLANNEL_GLDFLAGS += -extldflags '-static'
-endif
-
-define FLANNEL_CONFIGURE_CMDS
- # Put sources at prescribed GOPATH location.
- mkdir -p $(@D)/gopath/src/github.com/coreos
- ln -s $(@D) $(@D)/gopath/src/github.com/coreos/flannel
-endef
-
-define FLANNEL_BUILD_CMDS
- cd $(@D) && $(FLANNEL_MAKE_ENV) $(HOST_DIR)/bin/go \
- build -v -o $(@D)/bin/flanneld -ldflags "$(FLANNEL_GLDFLAGS)" .
-endef
+FLANNEL_GO_LDFLAGS = -X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION)
+# Install flannel to its well known location.
define FLANNEL_INSTALL_TARGET_CMDS
- # Install flannel to its well known location.
- $(INSTALL) -D -m 0755 $(@D)/bin/flanneld $(TARGET_DIR)/opt/bin/flanneld
+ $(INSTALL) -D -m 0755 $(FLANNEL_BINDIR)/flannel $(TARGET_DIR)/opt/bin/flanneld
$(INSTALL) -D -m 0755 $(@D)/dist/mk-docker-opts.sh $(TARGET_DIR)/opt/bin/mk-docker-opts.sh
endef
-$(eval $(generic-package))
+$(eval $(golang-package))
--
2.7.4
next prev parent reply other threads:[~2017-10-24 21:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-24 21:14 [Buildroot] [RFC v4 1/4] package/pkg-golang: new package infrastructure Angelo Compagnucci
2017-10-24 21:14 ` [Buildroot] [RFC v4 2/4] docs/manual: adding documentation for the golang infrastructure Angelo Compagnucci
2017-10-24 21:14 ` Angelo Compagnucci [this message]
2017-10-24 21:14 ` [Buildroot] [RFC v4 4/4] package/runc: converting to " Angelo Compagnucci
2017-10-24 22:14 ` Arnout Vandecappelle
2017-10-24 22:39 ` [Buildroot] [RFC v4 1/4] package/pkg-golang: new package infrastructure Arnout Vandecappelle
2017-10-25 8:53 ` Angelo Compagnucci
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=1508879672-12957-3-git-send-email-angelo.compagnucci@gmail.com \
--to=angelo.compagnucci@gmail.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