| Message ID | 20180331132736.21105-5-thomas.petazzoni@bootlin.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Introduce a golang-package infrastructure | expand |
Thomas, Angelo, All, On 2018-03-31 15:27 +0200, Thomas Petazzoni spake thusly: > From: Angelo Compagnucci <angelo@amarulasolutions.com> > > 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> Regards, Yann E. MORIN. > --- > 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 bbb2c72a72..07d5d0dfd6 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_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)) > -- > 2.14.3 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index bbb2c72a72..07d5d0dfd6 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_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))