[Buildroot] [PATCH 1/2] rings: add the version major variable

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH 1/2] rings: add the version major variable
@ 2014-01-14 10:30 Jerzy Grzegorek
  2014-01-14 10:30 ` [Buildroot] [PATCH 2/2] package: unification of use $(subst [._-], [._-], $(<PKG>_VERSION)) macro Jerzy Grzegorek
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Jerzy Grzegorek @ 2014-01-14 10:30 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
---
 package/rings/rings.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/rings/rings.mk b/package/rings/rings.mk
index d052f5d..2876162 100644
--- a/package/rings/rings.mk
+++ b/package/rings/rings.mk
@@ -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
 
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 2/2] package: unification of use $(subst [._-], [._-], $(<PKG>_VERSION)) macro
  2014-01-14 10:30 [Buildroot] [PATCH 1/2] rings: add the version major variable Jerzy Grzegorek
@ 2014-01-14 10:30 ` Jerzy Grzegorek
  2014-01-14 13:54   ` Peter Korsgaard
  2014-01-14 10:54 ` [Buildroot] [PATCH 1/2] rings: add the version major variable Peter Korsgaard
  2014-01-28 21:58 ` Thomas Petazzoni
  2 siblings, 1 reply; 7+ messages in thread
From: Jerzy Grzegorek @ 2014-01-14 10:30 UTC (permalink / raw)
  To: buildroot

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 <jerzy.grzegorek@trzebnica.net>
---
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(-)

diff --git a/package/boost/boost.mk b/package/boost/boost.mk
index 9ead1dd..7aab614 100644
--- a/package/boost/boost.mk
+++ b/package/boost/boost.mk
@@ -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
diff --git a/package/duma/duma.mk b/package/duma/duma.mk
index 93ae16e..d11987f 100644
--- a/package/duma/duma.mk
+++ b/package/duma/duma.mk
@@ -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
 
diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk
index 7215127..666df74 100644
--- a/package/libnss/libnss.mk
+++ b/package/libnss/libnss.mk
@@ -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
diff --git a/package/rings/rings.mk b/package/rings/rings.mk
index 2876162..09d9b02 100644
--- a/package/rings/rings.mk
+++ b/package/rings/rings.mk
@@ -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))
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 2/2] package: unification of use $(subst [._-], [._-], $(<PKG>_VERSION)) macro
  2014-01-14 10:30 ` [Buildroot] [PATCH 2/2] package: unification of use $(subst [._-], [._-], $(<PKG>_VERSION)) macro Jerzy Grzegorek
@ 2014-01-14 13:54   ` Peter Korsgaard
  0 siblings, 0 replies; 7+ messages in thread
From: Peter Korsgaard @ 2014-01-14 13:54 UTC (permalink / raw)
  To: buildroot

>>>>> "Jerzy" == Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> 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

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

 > Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
 > ---
 > v2:
 > - add rings package
 > - rebase on master

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 1/2] rings: add the version major variable
  2014-01-14 10:30 [Buildroot] [PATCH 1/2] rings: add the version major variable Jerzy Grzegorek
  2014-01-14 10:30 ` [Buildroot] [PATCH 2/2] package: unification of use $(subst [._-], [._-], $(<PKG>_VERSION)) macro Jerzy Grzegorek
@ 2014-01-14 10:54 ` Peter Korsgaard
  2014-01-28 21:58 ` Thomas Petazzoni
  2 siblings, 0 replies; 7+ messages in thread
From: Peter Korsgaard @ 2014-01-14 10:54 UTC (permalink / raw)
  To: buildroot

>>>>> "Jerzy" == Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> writes:

 > Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 1/2] rings: add the version major variable
  2014-01-14 10:30 [Buildroot] [PATCH 1/2] rings: add the version major variable Jerzy Grzegorek
  2014-01-14 10:30 ` [Buildroot] [PATCH 2/2] package: unification of use $(subst [._-], [._-], $(<PKG>_VERSION)) macro Jerzy Grzegorek
  2014-01-14 10:54 ` [Buildroot] [PATCH 1/2] rings: add the version major variable Peter Korsgaard
@ 2014-01-28 21:58 ` Thomas Petazzoni
  2014-01-28 22:40   ` Jerzy Grzegorek
  2 siblings, 1 reply; 7+ messages in thread
From: Thomas Petazzoni @ 2014-01-28 21:58 UTC (permalink / raw)
  To: buildroot

Dear Jerzy Grzegorek,

On Tue, 14 Jan 2014 11:30:57 +0100, Jerzy Grzegorek wrote:
> Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
> ---
>  package/rings/rings.mk |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/package/rings/rings.mk b/package/rings/rings.mk
> index d052f5d..2876162 100644
> --- a/package/rings/rings.mk
> +++ b/package/rings/rings.mk
> @@ -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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 1/2] rings: add the version major variable
  2014-01-28 21:58 ` Thomas Petazzoni
@ 2014-01-28 22:40   ` Jerzy Grzegorek
  2014-01-29  6:35     ` Thomas Petazzoni
  0 siblings, 1 reply; 7+ messages in thread
From: Jerzy Grzegorek @ 2014-01-28 22:40 UTC (permalink / raw)
  To: buildroot


Hi Thomas,

> Dear Jerzy Grzegorek,
>
> On Tue, 14 Jan 2014 11:30:57 +0100, Jerzy Grzegorek wrote:
>> Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net>
>> ---
>>   package/rings/rings.mk |    3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/package/rings/rings.mk b/package/rings/rings.mk
>> index d052f5d..2876162 100644
>> --- a/package/rings/rings.mk
>> +++ b/package/rings/rings.mk
>> @@ -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

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

Regards,
Jerzy

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [Buildroot] [PATCH 1/2] rings: add the version major variable
  2014-01-28 22:40   ` Jerzy Grzegorek
@ 2014-01-29  6:35     ` Thomas Petazzoni
  0 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2014-01-29  6:35 UTC (permalink / raw)
  To: buildroot

Dear Jerzy Grzegorek,

On Tue, 28 Jan 2014 23:40:11 +0100, Jerzy Grzegorek wrote:

> >> -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
> 
> 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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2014-01-29  6:35 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-14 10:30 [Buildroot] [PATCH 1/2] rings: add the version major variable Jerzy Grzegorek
2014-01-14 10:30 ` [Buildroot] [PATCH 2/2] package: unification of use $(subst [._-], [._-], $(<PKG>_VERSION)) macro Jerzy Grzegorek
2014-01-14 13:54   ` Peter Korsgaard
2014-01-14 10:54 ` [Buildroot] [PATCH 1/2] rings: add the version major variable Peter Korsgaard
2014-01-28 21:58 ` Thomas Petazzoni
2014-01-28 22:40   ` Jerzy Grzegorek
2014-01-29  6:35     ` Thomas Petazzoni

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox