package/docker-proxy: convert to golang infrastructure
authorThomas Petazzoni <thomas.petazzoni@bootlin.com>
Sat, 31 Mar 2018 13:27:36 +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: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[Arnout: remove automatically added host-go dependency]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
package/docker-proxy/docker-proxy.mk

index 3bf6546d267758c9a4e0975212227b89865d109e..a90271fc353b38c71a01ca5587e6bc6d04dc668f 100644 (file)
@@ -10,37 +10,14 @@ DOCKER_PROXY_SITE = $(call github,docker,libnetwork,$(DOCKER_PROXY_VERSION))
 DOCKER_PROXY_LICENSE = Apache-2.0
 DOCKER_PROXY_LICENSE_FILES = LICENSE
 
-DOCKER_PROXY_DEPENDENCIES = host-go host-pkgconf
+DOCKER_PROXY_DEPENDENCIES = host-pkgconf
 
-DOCKER_PROXY_GOPATH = "$(@D)/gopath"
-DOCKER_PROXY_MAKE_ENV = $(HOST_GO_TARGET_ENV) \
-       CGO_ENABLED=1 \
-       CGO_NO_EMULATION=1 \
-       GOBIN="$(@D)/bin" \
-       GOPATH="$(DOCKER_PROXY_GOPATH)" \
-       PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-       $(TARGET_MAKE_ENV)
+DOCKER_PROXY_WORKSPACE = gopath
 
-ifeq ($(BR2_STATIC_LIBS),y)
-DOCKER_PROXY_GLDFLAGS += -extldflags '-static'
-endif
-
-define DOCKER_PROXY_CONFIGURE_CMDS
-       mkdir -p $(DOCKER_PROXY_GOPATH)/src/github.com/docker
-       ln -fs $(@D) $(DOCKER_PROXY_GOPATH)/src/github.com/docker/libnetwork
-endef
-
-define DOCKER_PROXY_BUILD_CMDS
-       cd $(@D)/gopath/src/github.com/docker/libnetwork; \
-       $(DOCKER_PROXY_MAKE_ENV) \
-       $(HOST_DIR)/usr/bin/go build -v \
-               -o $(@D)/bin/docker-proxy \
-               -ldflags "$(DOCKER_PROXY_GLDFLAGS)" \
-               github.com/docker/libnetwork/cmd/proxy
-endef
+DOCKER_PROXY_BUILD_TARGETS = cmd/proxy
 
 define DOCKER_PROXY_INSTALL_TARGET_CMDS
-       $(INSTALL) -D -m 0755 $(@D)/bin/docker-proxy $(TARGET_DIR)/usr/bin/docker-proxy
+       $(INSTALL) -D -m 0755 $(@D)/$(DOCKER_PROXY_BINDIR)/proxy $(TARGET_DIR)/usr/bin/docker-proxy
 endef
 
-$(eval $(generic-package))
+$(eval $(golang-package))