| Message ID | 20191027065629.16426-1-matthew.weber@rockwellcollins.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | package/flannel: remove 'v' prefix | expand |
On 27/10/2019 07:56, Matt Weber wrote: > Fixes version parsing for release-monitoring.org support. > > Cc: Heiko Thiery <heiko.thiery@kontron.com> > Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> > --- > package/flannel/flannel.mk | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk > index d00d2df92c..e944012358 100644 > --- a/package/flannel/flannel.mk > +++ b/package/flannel/flannel.mk > @@ -4,14 +4,14 @@ > # > ################################################################################ > > -FLANNEL_VERSION = v0.5.5 > +FLANNEL_VERSION = 0.5.5 > FLANNEL_SITE = https://github.com/coreos/flannel/archive > -FLANNEL_SOURCE = $(FLANNEL_VERSION).tar.gz > +FLANNEL_SOURCE = v$(FLANNEL_VERSION).tar.gz > > FLANNEL_LICENSE = Apache-2.0 > FLANNEL_LICENSE_FILES = LICENSE > > -FLANNEL_LDFLAGS = -X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION) > +FLANNEL_LDFLAGS = -X github.com/coreos/flannel/version.Version=v$(FLANNEL_VERSION) I'm not a Go expert, but I would think that this can also be without the v. Regards, Arnout
Arnout, On Sun, Oct 27, 2019 at 3:13 AM Arnout Vandecappelle <arnout@mind.be> wrote: > > > > On 27/10/2019 07:56, Matt Weber wrote: > > Fixes version parsing for release-monitoring.org support. > > > > Cc: Heiko Thiery <heiko.thiery@kontron.com> > > Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> > > --- > > package/flannel/flannel.mk | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk > > index d00d2df92c..e944012358 100644 > > --- a/package/flannel/flannel.mk > > +++ b/package/flannel/flannel.mk > > @@ -4,14 +4,14 @@ > > # > > ################################################################################ > > > > -FLANNEL_VERSION = v0.5.5 > > +FLANNEL_VERSION = 0.5.5 > > FLANNEL_SITE = https://github.com/coreos/flannel/archive > > -FLANNEL_SOURCE = $(FLANNEL_VERSION).tar.gz > > +FLANNEL_SOURCE = v$(FLANNEL_VERSION).tar.gz > > > > FLANNEL_LICENSE = Apache-2.0 > > FLANNEL_LICENSE_FILES = LICENSE > > > > -FLANNEL_LDFLAGS = -X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION) > > +FLANNEL_LDFLAGS = -X github.com/coreos/flannel/version.Version=v$(FLANNEL_VERSION) > > I'm not a Go expert, but I would think that this can also be without the v. I did a quick test and it doesn't seem to matter if we drop the v from the LDFLAGS line. I'll make this fixup in the v2 Regards, Matt
diff --git a/package/flannel/flannel.mk b/package/flannel/flannel.mk index d00d2df92c..e944012358 100644 --- a/package/flannel/flannel.mk +++ b/package/flannel/flannel.mk @@ -4,14 +4,14 @@ # ################################################################################ -FLANNEL_VERSION = v0.5.5 +FLANNEL_VERSION = 0.5.5 FLANNEL_SITE = https://github.com/coreos/flannel/archive -FLANNEL_SOURCE = $(FLANNEL_VERSION).tar.gz +FLANNEL_SOURCE = v$(FLANNEL_VERSION).tar.gz FLANNEL_LICENSE = Apache-2.0 FLANNEL_LICENSE_FILES = LICENSE -FLANNEL_LDFLAGS = -X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION) +FLANNEL_LDFLAGS = -X github.com/coreos/flannel/version.Version=v$(FLANNEL_VERSION) # Install flannel to its well known location. define FLANNEL_INSTALL_TARGET_CMDS
Fixes version parsing for release-monitoring.org support. Cc: Heiko Thiery <heiko.thiery@kontron.com> Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com> --- package/flannel/flannel.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)