package: unification of name <pkg>_VERSION_MAJOR variable
PATCH 1/2 package: unification of name <pkg>_VERSION_MAJOR variable
Currently there are two different names of the major version variable:
<PKG>_MAJOR_VERSION and <PKG>_VERSION_MAJOR
This patch unifies them to <PKG>_VERSION_MAJOR
--- package/gdk-pixbuf/gdk-pixbuf.mk | 6 +++--- package/glib-networking/glib-networking.mk | 6 +++--- package/json-glib/json-glib.mk | 6 +++--- package/libsoup/libsoup.mk | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-)
package/gdk-pixbuf/gdk-pixbuf.mk +3 -3
@@ -4,10 +4,10 @@ # ################################################################################ -GDK_PIXBUF_MAJOR_VERSION = 2.28 -GDK_PIXBUF_VERSION = $(GDK_PIXBUF_MAJOR_VERSION).2 +GDK_PIXBUF_VERSION_MAJOR = 2.28 +GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).2 GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz -GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_MAJOR_VERSION) +GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR) GDK_PIXBUF_LICENSE = LGPLv2+ GDK_PIXBUF_LICENSE_FILES = COPYING GDK_PIXBUF_INSTALL_STAGING = YES
package/glib-networking/glib-networking.mk +3 -3
@@ -4,10 +4,10 @@ # ################################################################################ -GLIB_NETWORKING_MAJOR_VERSION = 2.36 +GLIB_NETWORKING_VERSION_MAJOR = 2.36 GLIB_NETWORKING_MINOR_VERSION = 2 -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_MAJOR_VERSION).$(GLIB_NETWORKING_MINOR_VERSION) -GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_MAJOR_VERSION) +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).$(GLIB_NETWORKING_MINOR_VERSION) +GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz GLIB_NETWORKING_INSTALL_STAGING = YES
package/json-glib/json-glib.mk +3 -3
@@ -4,10 +4,10 @@ # ################################################################################ -JSON_GLIB_MAJOR_VERSION = 0.14 +JSON_GLIB_VERSION_MAJOR = 0.14 JSON_GLIB_MINOR_VERSION = 2 -JSON_GLIB_VERSION = $(JSON_GLIB_MAJOR_VERSION).$(JSON_GLIB_MINOR_VERSION) -JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_MAJOR_VERSION) +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).$(JSON_GLIB_MINOR_VERSION) +JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR) JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz JSON_GLIB_LICENSE = LGPLv2.1+ JSON_GLIB_LICENSE_FILES = COPYING
package/libsoup/libsoup.mk +3 -3
@@ -4,11 +4,11 @@ # ################################################################################ -LIBSOUP_MAJOR_VERSION = 2.43 +LIBSOUP_VERSION_MAJOR = 2.43 LIBSOUP_MINOR_VERSION = 1 -LIBSOUP_VERSION = $(LIBSOUP_MAJOR_VERSION).$(LIBSOUP_MINOR_VERSION) +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).$(LIBSOUP_MINOR_VERSION) LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz -LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_MAJOR_VERSION) +LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPLv2+ LIBSOUP_LICENSE_FILES = COPYING LIBSOUP_INSTALL_STAGING = YES
Signature · 1 line
1.7.9.5
PATCH 2/2 package: unification of name <pkg>_VERSION_MINOR variable
Currently there are two different names of the minor version variable:
<PKG>_MINOR_VERSION and <PKG>_VERSION_MINOR
This patch unifies them to <PKG>_VERSION_MINOR
--- package/glib-networking/glib-networking.mk | 4 ++-- package/json-glib/json-glib.mk | 4 ++-- package/libsoup/libsoup.mk | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
package/glib-networking/glib-networking.mk +2 -2
@@ -5,8 +5,8 @@ ################################################################################ GLIB_NETWORKING_VERSION_MAJOR = 2.36 -GLIB_NETWORKING_MINOR_VERSION = 2 -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).$(GLIB_NETWORKING_MINOR_VERSION) +GLIB_NETWORKING_VERSION_MINOR = 2 +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).$(GLIB_NETWORKING_VERSION_MINOR) GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz
package/json-glib/json-glib.mk +2 -2
@@ -5,8 +5,8 @@ ################################################################################ JSON_GLIB_VERSION_MAJOR = 0.14 -JSON_GLIB_MINOR_VERSION = 2 -JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).$(JSON_GLIB_MINOR_VERSION) +JSON_GLIB_VERSION_MINOR = 2 +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).$(JSON_GLIB_VERSION_MINOR) JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR) JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz JSON_GLIB_LICENSE = LGPLv2.1+
package/libsoup/libsoup.mk +2 -2
@@ -5,8 +5,8 @@ ################################################################################ LIBSOUP_VERSION_MAJOR = 2.43 -LIBSOUP_MINOR_VERSION = 1 -LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).$(LIBSOUP_MINOR_VERSION) +LIBSOUP_VERSION_MINOR = 1 +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).$(LIBSOUP_VERSION_MINOR) LIBSOUP_SOURCE = libsoup-$(LIBSOUP_VERSION).tar.xz LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_MAJOR) LIBSOUP_LICENSE = LGPLv2+
Signature · 1 line
1.7.9.5
PATCH 1/2 package: unification of name <pkg>_VERSION_MAJOR variable
In reply to Jerzy GrzegorekDear Jerzy Grzegorek,
package/json-glib/json-glib.mk line 9
Quoted 3 lines · Jerzy Grzegorek
package/json-glib/json-glib.mk +1
-2-JSON_GLIB_VERSION = $(JSON_GLIB_MAJOR_VERSION).$(JSON_GLIB_MINOR_VERSION) -JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_MAJOR_VERSION) +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).$(JSON_GLIB_MINOR_VERSION)
So we have VERSION_MAJOR and then MINOR_VERSION ? Doesn't seem really consistent.
package/libsoup/libsoup.mk line 9
Quoted 2 lines
package/libsoup/libsoup.mk +1
-1-LIBSOUP_VERSION = $(LIBSOUP_MAJOR_VERSION).$(LIBSOUP_MINOR_VERSION) +LIBSOUP_VERSION = $(LIBSOUP_VERSION_MAJOR).$(LIBSOUP_MINOR_VERSION)
Same here.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/2 package: unification of name <pkg>_VERSION_MAJOR variable
Jerzy,
Quoted 10 lines · Thomas Petazzoni
Dear Jerzy Grzegorek,
package/json-glib/json-glib.mk line 9
Quoted 3 lines · Jerzy Grzegorek
package/json-glib/json-glib.mk +1
-2-JSON_GLIB_VERSION = $(JSON_GLIB_MAJOR_VERSION).$(JSON_GLIB_MINOR_VERSION) -JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_MAJOR_VERSION) +JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).$(JSON_GLIB_MINOR_VERSION)So we have
VERSION_MAJORand thenMINOR_VERSION? Doesn't seem really consistent.
Ok, ignore that comment, sorry. I did review PATCH 1/2, and only after that I saw PATCH 2/2. So just ignore my stupidity :)
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/2 package: unification of name <pkg>_VERSION_MAJOR variable
In reply to Jerzy GrzegorekQuoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Jerzy" == Jerzy Grzegorek <[email protected]> writes:
Currently there are two different names of the major version variable:
<PKG>_MAJOR_VERSION and <PKG>_VERSION_MAJOR
This patch unifies them to <PKG>_VERSION_MAJORSigned-off-by Jerzy Grzegorek <[email protected]>
Committed both, thanks.
Signature · 1 line
Bye, Peter Korsgaard