Skip to contentSkip to conversation

packages: VERSION should reflect tag name

PATCH New Maxime Hadjinlian 2 participants 4 messages Oct 19, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 packages: VERSION should reflect tag name

As stated in the manual, for the github helper, the VERSION should value either a tag or a full commit ID.

---
 package/bmon/bmon.mk   | 4 ++--
 package/geoip/geoip.mk | 4 ++--
 package/lxc/lxc.mk     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
package/bmon/bmon.mk +2 -2
index d4c7a49..dc00d82 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-BMON_VERSION = 3.2
-BMON_SITE = $(call github,tgraf,bmon,v$(BMON_VERSION))
+BMON_VERSION = v3.2
+BMON_SITE = $(call github,tgraf,bmon,$(BMON_VERSION))
 # configure not shipped
 BMON_AUTORECONF = YES
 BMON_DEPENDENCIES = host-pkgconf libconfuse libnl ncurses
package/geoip/geoip.mk +2 -2
index bbfa014..869cc5e 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-GEOIP_VERSION = 1.6.0
+GEOIP_VERSION = v1.6.0
 GEOIP_SOURCE = GeoIP-$(GEOIP_VERSION).tar.gz
-GEOIP_SITE = $(call github,maxmind,geoip-api-c,v$(GEOIP_VERSION))
+GEOIP_SITE = $(call github,maxmind,geoip-api-c,$(GEOIP_VERSION))
 GEOIP_AUTORECONF = YES
 GEOIP_INSTALL_STAGING = YES
 GEOIP_LICENSE = LGPLv2.1+
package/lxc/lxc.mk +2 -2
index 38bda7e..953df13 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LXC_VERSION = 1.0.4
-LXC_SITE = $(call github,lxc,lxc,lxc-$(LXC_VERSION))
+LXC_VERSION = lxc-1.0.4
+LXC_SITE = $(call github,lxc,lxc,$(LXC_VERSION))
 LXC_LICENSE = LGPLv2.1+
 LXC_LICENSE_FILES = COPYING
 LXC_DEPENDENCIES = libcap host-pkgconf
Signature · 1 line
2.1.1
#1 lore raw

PATCH 2/2 geoip: Remove useless variable

---
 package/geoip/geoip.mk | 1 -
 1 file changed, 1 deletion(-)
package/geoip/geoip.mk +0 -1
index 869cc5e..0a0dad0 100644
@@ -5,7 +5,6 @@
 ################################################################################
 
 GEOIP_VERSION = v1.6.0
-GEOIP_SOURCE = GeoIP-$(GEOIP_VERSION).tar.gz
 GEOIP_SITE = $(call github,maxmind,geoip-api-c,$(GEOIP_VERSION))
 GEOIP_AUTORECONF = YES
 GEOIP_INSTALL_STAGING = YES
Signature · 1 line
2.1.1
#2 lore raw

PATCH 2/2 geoip: Remove useless variable

This is a NAK, needs some more work since the packages has been bumped and there is a release file.
Will come back with a new patch.

Quoted 20 lines · Maxime Hadjinlian
---
 package/geoip/geoip.mk | 1 -
 1 file changed, 1 deletion(-)
package/geoip/geoip.mk +0 -2
index 869cc5e..0a0dad0 100644
@@ -5,7 +5,6 @@
 ################################################################################
 
 GEOIP_VERSION = v1.6.0
-GEOIP_SOURCE = GeoIP-$(GEOIP_VERSION).tar.gz
 GEOIP_SITE = $(call github,maxmind,geoip-api-c,$(GEOIP_VERSION))
 GEOIP_AUTORECONF = YES
 GEOIP_INSTALL_STAGING = YES
--

2.1.1

#3 lore raw

PATCH 1/2 packages: VERSION should reflect tag name

In reply to Maxime Hadjinlian

Maxime, All,

On 2014-10-19 12:49 +0200, Maxime Hadjinlian spake thusly:

Quoted 15 lines

As stated in the manual, for the github helper, the VERSION should value either a tag or a full commit ID.

---
 package/bmon/bmon.mk   | 4 ++--
 package/geoip/geoip.mk | 4 ++--
 package/lxc/lxc.mk     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
package/bmon/bmon.mk +0 -0
index d4c7a49..dc00d82 100644

package/bmon/bmon.mk line 8

Quoted 7 lines
package/bmon/bmon.mk +2 -2
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-BMON_VERSION = 3.2
-BMON_SITE = $(call github,tgraf,bmon,v$(BMON_VERSION))
+BMON_VERSION = v3.2
+BMON_SITE = $(call github,tgraf,bmon,$(BMON_VERSION))

That's also a case where:
- the package has a new release, 3.5
- there is a release tarball, so we should not use the github helper

Quoted 8 lines
package/bmon/bmon.mk +0 -0
 # configure not shipped
 BMON_AUTORECONF = YES
 BMON_DEPENDENCIES = host-pkgconf libconfuse libnl ncurses
package/geoip/geoip.mk +0 -0
index bbfa014..869cc5e 100644

package/geoip/geoip.mk line 9

Quoted 8 lines
package/geoip/geoip.mk +2 -2
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-GEOIP_VERSION = 1.6.0
+GEOIP_VERSION = v1.6.0
 GEOIP_SOURCE = GeoIP-$(GEOIP_VERSION).tar.gz
-GEOIP_SITE = $(call github,maxmind,geoip-api-c,v$(GEOIP_VERSION))
+GEOIP_SITE = $(call github,maxmind,geoip-api-c,$(GEOIP_VERSION))

Ditto:
- release 1.6.2 is out
- there is a release tarball

Quoted 8 lines
package/geoip/geoip.mk +0 -0
 GEOIP_AUTORECONF = YES
 GEOIP_INSTALL_STAGING = YES
 GEOIP_LICENSE = LGPLv2.1+
package/lxc/lxc.mk +0 -0
index 38bda7e..953df13 100644

package/lxc/lxc.mk line 7

Quoted 6 lines
package/lxc/lxc.mk +1 -2
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LXC_VERSION = 1.0.4
-LXC_SITE = $(call github,lxc,lxc,lxc-$(LXC_VERSION))
+LXC_VERSION = lxc-1.0.4o

There's also a new release: 1.0.6.

Quoted 11 lines
package/lxc/lxc.mk +1 -0
+LXC_SITE = $(call github,lxc,lxc,$(LXC_VERSION))
 LXC_LICENSE = LGPLv2.1+
 LXC_LICENSE_FILES = COPYING
 LXC_DEPENDENCIES = libcap host-pkgconf
Signature · 6 lines
2.1.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'