Patchwork toolchain package: set version as 'virtual' instead of 'undefined'

login
register
mail settings
Submitter Thomas De Schampheleire
Date May 6, 2014, 10:51 a.m.
Message ID <0533846efc9952901283.1399373479@argentina>
Download mbox | patch
Permalink /patch/346127/
State Superseded
Headers show

Comments

Thomas De Schampheleire - May 6, 2014, 10:51 a.m.
This patch causes the log messages to change from:

>>> toolchain-external undefined Downloading
>>> toolchain-external undefined Extracting
...

to

>>> toolchain-external virtual Downloading
>>> toolchain-external virtual Extracting
...

and similar for 'toolchain' and 'toolchain-buildroot', simply because it
looks nicer.
At the same time, the directory names also become toolchain-virtual,
toolchain-buildroot-virtual, toolchain-external-virtual instead of the
corresponding 'undefined' variants.

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

---
 toolchain/toolchain-buildroot/toolchain-buildroot.mk |  1 +
 toolchain/toolchain-external/toolchain-external.mk   |  2 ++
 toolchain/toolchain/toolchain.mk                     |  1 +
 3 files changed, 4 insertions(+), 0 deletions(-)
Thomas Petazzoni - May 6, 2014, 12:07 p.m.
Dear Thomas De Schampheleire,

On Tue, 06 May 2014 12:51:19 +0200, Thomas De Schampheleire wrote:
> This patch causes the log messages to change from:
> 
> >>> toolchain-external undefined Downloading
> >>> toolchain-external undefined Extracting
> ...
> 
> to
> 
> >>> toolchain-external virtual Downloading
> >>> toolchain-external virtual Extracting
> ...
> 
> and similar for 'toolchain' and 'toolchain-buildroot', simply because it
> looks nicer.
> At the same time, the directory names also become toolchain-virtual,
> toolchain-buildroot-virtual, toolchain-external-virtual instead of the
> corresponding 'undefined' variants.
> 
> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

Shouldn't we instead migrate these to use the virtual package
infrastructure, and make this infrastructure define this magic 'virtual'
version?

Thomas
Thomas De Schampheleire - May 6, 2014, 12:26 p.m.
On Tue, May 6, 2014 at 2:07 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Thomas De Schampheleire,
>
> On Tue, 06 May 2014 12:51:19 +0200, Thomas De Schampheleire wrote:
>> This patch causes the log messages to change from:
>>
>> >>> toolchain-external undefined Downloading
>> >>> toolchain-external undefined Extracting
>> ...
>>
>> to
>>
>> >>> toolchain-external virtual Downloading
>> >>> toolchain-external virtual Extracting
>> ...
>>
>> and similar for 'toolchain' and 'toolchain-buildroot', simply because it
>> looks nicer.
>> At the same time, the directory names also become toolchain-virtual,
>> toolchain-buildroot-virtual, toolchain-external-virtual instead of the
>> corresponding 'undefined' variants.
>>
>> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
> Shouldn't we instead migrate these to use the virtual package
> infrastructure, and make this infrastructure define this magic 'virtual'
> version?

For toolchain and toolchain-buildroot that would be possible, but for
toolchain-external not, right?

Thanks,
Thomas
Thomas Petazzoni - May 6, 2014, 12:38 p.m.
Dear Thomas De Schampheleire,

On Tue, 6 May 2014 14:26:31 +0200, Thomas De Schampheleire wrote:

> > Shouldn't we instead migrate these to use the virtual package
> > infrastructure, and make this infrastructure define this magic 'virtual'
> > version?
> 
> For toolchain and toolchain-buildroot that would be possible, but for
> toolchain-external not, right?

Right. But toolchain-external is not a virtual package, so setting its
version to 'virtual' would anyway be strange, no?

Thomas
Thomas De Schampheleire - May 6, 2014, 12:46 p.m.
On Tue, May 6, 2014 at 2:38 PM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
> Dear Thomas De Schampheleire,
>
> On Tue, 6 May 2014 14:26:31 +0200, Thomas De Schampheleire wrote:
>
>> > Shouldn't we instead migrate these to use the virtual package
>> > infrastructure, and make this infrastructure define this magic 'virtual'
>> > version?
>>
>> For toolchain and toolchain-buildroot that would be possible, but for
>> toolchain-external not, right?
>
> Right. But toolchain-external is not a virtual package, so setting its
> version to 'virtual' would anyway be strange, no?

Not more strange than setting the version to 'undefined' :-D

Any other string than 'undefined' is fine for me too.

Btw, for makedevs and mkpasswd, the version is also 'undefined' as the
source is included in buildroot.
I was first going to change their version to 'buildroot', but it makes
the messages a bit strange:

>>> host-makedevs buildroot Configuring...

etc.


Other ideas?
Thomas
Thomas De Schampheleire - May 6, 2014, 8:05 p.m.
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> schreef:
>Dear Thomas De Schampheleire,
>
>On Tue, 06 May 2014 12:51:19 +0200, Thomas De Schampheleire wrote:
>> This patch causes the log messages to change from:
>> 
>> >>> toolchain-external undefined Downloading
>> >>> toolchain-external undefined Extracting
>> ...
>> 
>> to
>> 
>> >>> toolchain-external virtual Downloading
>> >>> toolchain-external virtual Extracting
>> ...
>> 
>> and similar for 'toolchain' and 'toolchain-buildroot', simply because it
>> looks nicer.
>> At the same time, the directory names also become toolchain-virtual,
>> toolchain-buildroot-virtual, toolchain-external-virtual instead of the
>> corresponding 'undefined' variants.
>> 
>> Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
>
>Shouldn't we instead migrate these to use the virtual package
>infrastructure, and make this infrastructure define this magic 'virtual'
>version?

I tried using virtual-package in toolchain/toolchain/toolchain.mk, but TOOLCHAIN_VERSION becomes empty, while HOST_TOOLCHAIN_VERSION is virtual.

Yann, Thomas: any ideas?

Thanks,
Thomas
Arnout Vandecappelle - May 8, 2014, 6:59 a.m.
On 06/05/14 14:46, Thomas De Schampheleire wrote:
> On Tue, May 6, 2014 at 2:38 PM, Thomas Petazzoni
> <thomas.petazzoni@free-electrons.com> wrote:
>> Dear Thomas De Schampheleire,
>>
>> On Tue, 6 May 2014 14:26:31 +0200, Thomas De Schampheleire wrote:
>>
>>>> Shouldn't we instead migrate these to use the virtual package
>>>> infrastructure, and make this infrastructure define this magic 'virtual'
>>>> version?
>>>
>>> For toolchain and toolchain-buildroot that would be possible, but for
>>> toolchain-external not, right?
>>
>> Right. But toolchain-external is not a virtual package, so setting its
>> version to 'virtual' would anyway be strange, no?
> 
> Not more strange than setting the version to 'undefined' :-D
> 
> Any other string than 'undefined' is fine for me too.
> 
> Btw, for makedevs and mkpasswd, the version is also 'undefined' as the
> source is included in buildroot.
> I was first going to change their version to 'buildroot', but it makes
> the messages a bit strange:
> 
>>>> host-makedevs buildroot Configuring...

MAKEDEVS_VERSION = buildroot-$(BR2_VERSION)

?

 Regards,
 Arnout

Patch

diff --git a/toolchain/toolchain-buildroot/toolchain-buildroot.mk b/toolchain/toolchain-buildroot/toolchain-buildroot.mk
--- a/toolchain/toolchain-buildroot/toolchain-buildroot.mk
+++ b/toolchain/toolchain-buildroot/toolchain-buildroot.mk
@@ -5,6 +5,7 @@ 
 ################################################################################
 
 TOOLCHAIN_BUILDROOT_SOURCE =
+TOOLCHAIN_BUILDROOT_VERSION = virtual
 
 BR_LIBC = $(call qstrip,$(BR2_TOOLCHAIN_BUILDROOT_LIBC))
 
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -383,6 +383,8 @@  TOOLCHAIN_EXTERNAL_SITE =
 TOOLCHAIN_EXTERNAL_SOURCE =
 endif
 
+TOOLCHAIN_EXTERNAL_VERSION = virtual
+
 TOOLCHAIN_EXTERNAL_ADD_TOOLCHAIN_DEPENDENCY = NO
 
 TOOLCHAIN_EXTERNAL_INSTALL_STAGING = YES
diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk
--- a/toolchain/toolchain/toolchain.mk
+++ b/toolchain/toolchain/toolchain.mk
@@ -5,6 +5,7 @@ 
 ################################################################################
 
 TOOLCHAIN_SOURCE =
+TOOLCHAIN_VERSION = virtual
 
 ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
 TOOLCHAIN_DEPENDENCIES += toolchain-buildroot