package/flannel: convert to golang infrastructure
authorAngelo Compagnucci <angelo@amarulasolutions.com>
Sat, 31 Mar 2018 13:27:32 +0000 (15:27 +0200)
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Sat, 31 Mar 2018 17:57:31 +0000 (19:57 +0200)
Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
package/flannel/flannel.mk

index bbb2c72a729a18bd9bf9d61a3b4d176e34231f22..07d5d0dfd6937beeffa4a7b2b47f59d60b5f61be 100644 (file)
@@ -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_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 $(@D)/$(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))