[Buildroot] [PATCH 2/2] package/pkg-golang: drop the fixed <pkg>_BINDIR variable
Yann E. MORIN
yann.morin.1998 at free.fr
Sun Apr 1 12:27:11 UTC 2018
Thomas, All,
On 2018-04-01 13:51 +0200, Thomas Petazzoni spake thusly:
> Now that <pkg>_BINDIR is always "bin", having it as a package variable
> doesn't make much sense, so get rid of this variable completely, and
> use "bin".
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
Regards,
Yann E. MORIN.
> ---
> package/docker-proxy/docker-proxy.mk | 2 +-
> package/flannel/flannel.mk | 2 +-
> package/pkg-golang.mk | 5 ++---
> 3 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/package/docker-proxy/docker-proxy.mk b/package/docker-proxy/docker-proxy.mk
> index a90271fc35..dfa9d4347d 100644
> --- a/package/docker-proxy/docker-proxy.mk
> +++ b/package/docker-proxy/docker-proxy.mk
> @@ -17,7 +17,7 @@ DOCKER_PROXY_WORKSPACE = gopath
> DOCKER_PROXY_BUILD_TARGETS = cmd/proxy
>
> define DOCKER_PROXY_INSTALL_TARGET_CMDS
> - $(INSTALL) -D -m 0755 $(@D)/$(DOCKER_PROXY_BINDIR)/proxy $(TARGET_DIR)/usr/bin/docker-proxy
> + $(INSTALL) -D -m 0755 $(@D)/bin/proxy $(TARGET_DIR)/usr/bin/docker-proxy
> endef
>
> $(eval $(golang-package))
> diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk
> index 07d5d0dfd6..d00d2df92c 100644
> --- a/package/flannel/flannel.mk
> +++ b/package/flannel/flannel.mk
> @@ -15,7 +15,7 @@ FLANNEL_LDFLAGS = -X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION
>
> # Install flannel to its well known location.
> define FLANNEL_INSTALL_TARGET_CMDS
> - $(INSTALL) -D -m 0755 $(@D)/$(FLANNEL_BINDIR)/flannel $(TARGET_DIR)/opt/bin/flanneld
> + $(INSTALL) -D -m 0755 $(@D)/bin/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
>
> diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk
> index c21be86a55..5891317b60 100644
> --- a/package/pkg-golang.mk
> +++ b/package/pkg-golang.mk
> @@ -70,7 +70,6 @@ ifeq ($$($(2)_BUILD_TARGETS),.)
> $(2)_BIN_NAME ?= $(1)
> endif
>
> -$(2)_BINDIR = bin
> $(2)_INSTALL_BINS ?= $(1)
>
> # Source files in Go should be extracted in a precise folder in the hierarchy
> @@ -103,7 +102,7 @@ define $(2)_BUILD_CMDS
> GOPATH="$$(@D)/$$($(2)_WORKSPACE)" \
> $$($(2)_GO_ENV) \
> $$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \
> - -o $$(@D)/$$($(2)_BINDIR)/$$(if $$($(2)_BIN_NAME),$$($(2)_BIN_NAME),$$(notdir $$(d))) \
> + -o $$(@D)/bin/$$(if $$($(2)_BIN_NAME),$$($(2)_BIN_NAME),$$(notdir $$(d))) \
> ./$$(d)
> )
> endef
> @@ -114,7 +113,7 @@ endif
> ifndef $(2)_INSTALL_TARGET_CMDS
> define $(2)_INSTALL_TARGET_CMDS
> $$(foreach d,$$($(2)_INSTALL_BINS),\
> - $(INSTALL) -D -m 0755 $$(@D)/$$($(2)_BINDIR)/$$(d) $(TARGET_DIR)/usr/bin/$$(d)
> + $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $(TARGET_DIR)/usr/bin/$$(d)
> )
> endef
> endif
> --
> 2.14.3
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
More information about the buildroot
mailing list