Skip to contentSkip to conversation

rings: add the version major variable

PATCH New Jerzy Grzegorek 3 participants 7 messages Jan 14, 2014 – Jan 29, 2014

lore
Share & tools
lore

Jerzy Grzegorek

author
#0 lore raw

PATCH 1/2 rings: add the version major variable

Signed-off-by Jerzy Grzegorek <[email protected]>
---
 package/rings/rings.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/rings/rings.mk +2 -1
index d052f5d..2876162 100644
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-RINGS_VERSION = 1.3.0-1
+RINGS_VERSION_MAJOR = 1.3.0
+RINGS_VERSION = $(RINGS_VERSION_MAJOR)-1
 RINGS_SUBDIR  = rings-v_1_3_0
 RINGS_LICENSE = MIT
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 2/2 package: unification of use $(subst [._-], [._-], $(<PKG>_VERSION)) macro

Currently, there are five packages which use 'subst' macro to change their version.

* Three of them (ebtables, icu, perl) use this macro "in place" :

   EBTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/ebtables/ebtables-$(subst .,-,$(EBTABLES_VERSION))

   ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz

   PERL_CROSS_OLD_POD = perl$(subst .,,$(PERL_CROSS_BASE_VERSION))delta.pod
   PERL_CROSS_NEW_POD = perl$(subst .,,$(PERL_VERSION))delta.pod

* Two of them (boost, libnss) use an additional variable :

   BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION))
   BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2

   LIBNSS_SITE_VERSION = $(subst .,_,$(LIBNSS_VERSION))
   LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(LIBNSS_SITE_VERSION)_RTM/src

* Additionally two packages (duma, rings) doesn't use it at all :

DUMA_VERSION = 2_5_15
DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/2.5.15

RINGS_VERSION_MAJOR = 1.3.0
RINGS_SUBDIR = rings-v_1_3_0

This commit makes changes to use 'subst' macro "in place", in all of them.

Signed-off-by Jerzy Grzegorek <[email protected]>

---
v2:
- add rings package
- rebase on master

 package/boost/boost.mk   |    3 +--
 package/duma/duma.mk     |    6 +++---
 package/libnss/libnss.mk |    3 +--
 package/rings/rings.mk   |    2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)
package/boost/boost.mk +1 -2
index 9ead1dd..7aab614 100644
@@ -5,8 +5,7 @@
 ################################################################################
 
 BOOST_VERSION = 1.55.0
-BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION))
-BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2
+BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2
 BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION)
 BOOST_INSTALL_STAGING = YES
 BOOST_LICENSE = Boost Software License 1.0
package/duma/duma.mk +3 -3
index 93ae16e..d11987f 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-DUMA_VERSION = 2_5_15
-DUMA_SOURCE = duma_$(DUMA_VERSION).tar.gz
-DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/2.5.15
+DUMA_VERSION = 2.5.15
+DUMA_SOURCE = duma_$(subst .,_,$(DUMA_VERSION)).tar.gz
+DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/$(DUMA_VERSION)
 DUMA_LICENSE = GPLv2+ LGPLv2.1+
 DUMA_LICENSE_FILES = COPYING-GPL COPYING-LGPL
package/libnss/libnss.mk +1 -2
index 7215127..666df74 100644
@@ -6,8 +6,7 @@
 
 LIBNSS_VERSION = 3.14.5
 LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz
-LIBNSS_SITE_VERSION = $(subst .,_,$(LIBNSS_VERSION))
-LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(LIBNSS_SITE_VERSION)_RTM/src
+LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src
 LIBNSS_SUBDIR = mozilla/security
 LIBNSS_DISTDIR = mozilla/dist
 LIBNSS_INSTALL_STAGING = YES
package/rings/rings.mk +1 -1
index 2876162..09d9b02 100644
@@ -6,7 +6,7 @@
 
 RINGS_VERSION_MAJOR = 1.3.0
 RINGS_VERSION = $(RINGS_VERSION_MAJOR)-1
-RINGS_SUBDIR  = rings-v_1_3_0
+RINGS_SUBDIR  = rings-v_$(subst .,_,$(RINGS_VERSION_MAJOR))
 RINGS_LICENSE = MIT
 
 $(eval $(luarocks-package))
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/2 package: unification of use $(subst [._-], [._-], $(<PKG>_VERSION)) macro

Quoted 28 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Jerzy" == Jerzy Grzegorek <[email protected]> writes:

Currently, there are five packages which use 'subst' macro to change their version.
* Three of them (ebtables, icu, perl) use this macro "in place" :

   EBTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/ebtables/ebtables-$(subst .,-,$(EBTABLES_VERSION))

   ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz

   PERL_CROSS_OLD_POD = perl$(subst .,,$(PERL_CROSS_BASE_VERSION))delta.pod
   PERL_CROSS_NEW_POD = perl$(subst .,,$(PERL_VERSION))delta.pod

* Two of them (boost, libnss) use an additional variable :

   BOOST_FILE_VERSION = $(subst .,_,$(BOOST_VERSION))
   BOOST_SOURCE = boost_$(BOOST_FILE_VERSION).tar.bz2

   LIBNSS_SITE_VERSION = $(subst .,_,$(LIBNSS_VERSION))
   LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(LIBNSS_SITE_VERSION)_RTM/src

* Additionally two packages (duma, rings) doesn't use it at all :

   DUMA_VERSION = 2_5_15
   DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/2.5.15

   RINGS_VERSION_MAJOR = 1.3.0
   RINGS_SUBDIR  = rings-v_1_3_0
Quoted 7 lines

This commit makes changes to use 'subst' macro "in place", in all of them.

Signed-off-by Jerzy Grzegorek <[email protected]>

---
v2:
- add rings package
- rebase on master

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/2 rings: add the version major variable

In reply to Jerzy Grzegorek

Dear Jerzy Grzegorek,

Quoted 10 lines · Jerzy Grzegorek
Signed-off-by Jerzy Grzegorek <[email protected]>
---
 package/rings/rings.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
package/rings/rings.mk +0 -0
index d052f5d..2876162 100644

package/rings/rings.mk line 10

Quoted 8 lines
package/rings/rings.mk +2 -1
@@ -4,7 +4,8 @@
 #
 ################################################################################
 
-RINGS_VERSION = 1.3.0-1
+RINGS_VERSION_MAJOR = 1.3.0
+RINGS_VERSION = $(RINGS_VERSION_MAJOR)-1
 RINGS_SUBDIR  = rings-v_1_3_0
 RINGS_LICENSE = MIT

While I agree with <foo>_VERSION_MAJOR, when <foo>_VERSION_MAJOR is used in more than one place, I don't necessarily think it is needed when it is used in only one place, <foo>_VERSION.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
author
#5 lore raw

PATCH 1/2 rings: add the version major variable

Hi Thomas,

Quoted 25 lines

Dear Jerzy Grzegorek,

Quoted 10 lines · Jerzy Grzegorek
Signed-off-by Jerzy Grzegorek <[email protected]>
---
  package/rings/rings.mk |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
package/rings/rings.mk +0 -0
index d052f5d..2876162 100644

package/rings/rings.mk line 10

Quoted 8 lines
package/rings/rings.mk +2 -1
@@ -4,7 +4,8 @@
  #
  ################################################################################
 
-RINGS_VERSION = 1.3.0-1
+RINGS_VERSION_MAJOR = 1.3.0
+RINGS_VERSION = $(RINGS_VERSION_MAJOR)-1
  RINGS_SUBDIR  = rings-v_1_3_0
  RINGS_LICENSE = MIT

While I agree with <foo>_VERSION_MAJOR, when <foo>_VERSION_MAJOR is used in more than one place, I don't necessarily think it is needed when it is used in only one place, <foo>_VERSION.

Quoted 1 line

Thomas

I think, you didn't read my second patch:
[PATCH 2/2] package: unification of use $(subst
[._-],[._-],$(<PKG>_VERSION)) macro

Regards,
Jerzy

#6 lore raw

PATCH 1/2 rings: add the version major variable

Dear Jerzy Grzegorek,

Quoted 9 lines · Jerzy Grzegorek
Quoted 9 lines

package/rings/rings.mk line 10

Quoted 5 lines
package/rings/rings.mk +2 -1
-RINGS_VERSION = 1.3.0-1
+RINGS_VERSION_MAJOR = 1.3.0
+RINGS_VERSION = $(RINGS_VERSION_MAJOR)-1
  RINGS_SUBDIR  = rings-v_1_3_0
  RINGS_LICENSE = MIT

While I agree with <foo>_VERSION_MAJOR, when <foo>_VERSION_MAJOR is used in more than one place, I don't necessarily think it is needed when it is used in only one place, <foo>_VERSION.

Quoted 5 lines
Quoted 1 line

Thomas

I think, you didn't read my second patch:
[PATCH 2/2] package: unification of use $(subst
[._-],[._-],$(<PKG>_VERSION)) macro

Ah, yes, right. Sorry for this: as I said, I reading and replying to the e-mail traffic in a FIFO manner, so I sometimes miss things.

It would probably have been nice to mention in the commit log why it was necessary (for the next patch).

Anyway, thanks a lot for all these cleanup and coherency improvements, there are very appreciated!

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com