* [Buildroot] [PATCH 1/2] legal-info: fix detection of "override" packages
@ 2016-03-04 23:39 Luca Ceresoli
2016-03-04 23:39 ` [Buildroot] [PATCH 2/2] legal-info: remove outdated comment Luca Ceresoli
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Luca Ceresoli @ 2016-03-04 23:39 UTC (permalink / raw)
To: buildroot
The ifneq ($$($(2)_SITE_METHOD),override) test will always match
because SITE_METHOD is never set to "override". The result is that
some packages are downloaded and extracted unnecessarily, although
they are (correctly) not saved in output/legal-info/.
Fix by simply testing $(2)_OVERRIDE_SRCDIR instead: when empty, it
indicates that the packages is neither a "local" site-method package
nor a package that has its source directory overridden.
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
Suggested by Thomas on:
http://lists.busybox.net/pipermail/buildroot/2015-October/141032.html
---
package/pkg-generic.mk | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index e22babbcd0c9..9ea2a707baa4 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -757,13 +757,11 @@ endif
# non-local, and non-overriden. So only store, in the manifest, the tarball
# name of those packages.
ifeq ($$($(2)_REDISTRIBUTE),YES)
-ifneq ($$($(2)_SITE_METHOD),local)
-ifneq ($$($(2)_SITE_METHOD),override)
+ifeq ($$($(2)_OVERRIDE_SRCDIR),)
# Packages that have a tarball need it downloaded beforehand
$(1)-legal-info: $(1)-source $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))
endif
endif
-endif
# If FOO_ACTUAL_SOURCE_TARBALL is explicitly defined, it means FOO_SOURCE is
# indeed a binary (e.g. external toolchain) and FOO_ACTUAL_SOURCE_TARBALL/_SITE
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 2/2] legal-info: remove outdated comment
2016-03-04 23:39 [Buildroot] [PATCH 1/2] legal-info: fix detection of "override" packages Luca Ceresoli
@ 2016-03-04 23:39 ` Luca Ceresoli
2016-03-06 10:19 ` Yann E. MORIN
2016-03-06 10:13 ` [Buildroot] [PATCH 1/2] legal-info: fix detection of "override" packages Yann E. MORIN
2016-03-06 13:34 ` Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Luca Ceresoli @ 2016-03-04 23:39 UTC (permalink / raw)
To: buildroot
This comment is outdated since the assignment of $(2)_MANIFEST_TARBALL
and $(2)_MANIFEST_SITE have been removed, which happened in
b9f4727ff4d512868352494f5209fff4da147473.
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/pkg-generic.mk | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 9ea2a707baa4..189ccf8c8415 100644
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -754,8 +754,7 @@ $(1)-legal-info: $(1)-patch
endif
# We only save the sources of packages we want to redistribute, that are
-# non-local, and non-overriden. So only store, in the manifest, the tarball
-# name of those packages.
+# non-local, and non-overriden.
ifeq ($$($(2)_REDISTRIBUTE),YES)
ifeq ($$($(2)_OVERRIDE_SRCDIR),)
# Packages that have a tarball need it downloaded beforehand
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 2/2] legal-info: remove outdated comment
2016-03-04 23:39 ` [Buildroot] [PATCH 2/2] legal-info: remove outdated comment Luca Ceresoli
@ 2016-03-06 10:19 ` Yann E. MORIN
2016-03-06 22:52 ` Luca Ceresoli
0 siblings, 1 reply; 6+ messages in thread
From: Yann E. MORIN @ 2016-03-06 10:19 UTC (permalink / raw)
To: buildroot
Luca, All,
On 2016-03-05 00:39 +0100, Luca Ceresoli spake thusly:
> This comment is outdated since the assignment of $(2)_MANIFEST_TARBALL
> and $(2)_MANIFEST_SITE have been removed, which happened in
> b9f4727ff4d512868352494f5209fff4da147473.
>
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> package/pkg-generic.mk | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index 9ea2a707baa4..189ccf8c8415 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -754,8 +754,7 @@ $(1)-legal-info: $(1)-patch
> endif
>
> # We only save the sources of packages we want to redistribute, that are
> -# non-local, and non-overriden. So only store, in the manifest, the tarball
> -# name of those packages.
> +# non-local, and non-overriden.
I wondered why you kept 'local' here, but then I remembered that we
handle 'local' packages as if they were overriden. I think that's
inherently bad that we do that, but this is not the purpose of your
patch.
Still, I would prefer something like:
... that are non-overriden (local or true override).
otherwise:
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
BTW, you're not making my life easy: I'll have to rebase my own legal
series over that, and I expect quite a bunch of conflicts! ;-)
Regards,
Yann E. MORIN.
> ifeq ($$($(2)_REDISTRIBUTE),YES)
> ifeq ($$($(2)_OVERRIDE_SRCDIR),)
> # Packages that have a tarball need it downloaded beforehand
> --
> 1.9.1
>
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread* [Buildroot] [PATCH 2/2] legal-info: remove outdated comment
2016-03-06 10:19 ` Yann E. MORIN
@ 2016-03-06 22:52 ` Luca Ceresoli
0 siblings, 0 replies; 6+ messages in thread
From: Luca Ceresoli @ 2016-03-06 22:52 UTC (permalink / raw)
To: buildroot
Dear Yann,
On 06/03/2016 11:19, Yann E. MORIN wrote:
> Luca, All,
>
> On 2016-03-05 00:39 +0100, Luca Ceresoli spake thusly:
>> This comment is outdated since the assignment of $(2)_MANIFEST_TARBALL
>> and $(2)_MANIFEST_SITE have been removed, which happened in
>> b9f4727ff4d512868352494f5209fff4da147473.
>>
>> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
>> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
>> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
>> ---
>> package/pkg-generic.mk | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
>> index 9ea2a707baa4..189ccf8c8415 100644
>> --- a/package/pkg-generic.mk
>> +++ b/package/pkg-generic.mk
>> @@ -754,8 +754,7 @@ $(1)-legal-info: $(1)-patch
>> endif
>>
>> # We only save the sources of packages we want to redistribute, that are
>> -# non-local, and non-overriden. So only store, in the manifest, the tarball
>> -# name of those packages.
>> +# non-local, and non-overriden.
>
> I wondered why you kept 'local' here, but then I remembered that we
> handle 'local' packages as if they were overriden. I think that's
> inherently bad that we do that, but this is not the purpose of your
> patch.
>
> Still, I would prefer something like:
>
> ... that are non-overriden (local or true override).
>
> otherwise:
>
> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> BTW, you're not making my life easy: I'll have to rebase my own legal
> series over that, and I expect quite a bunch of conflicts! ;-)
Although I'm trying hard to make your life more difficult, I'm afraid
I'm not succeding! :-)
Seriously speaking, your legal series in its v4 cleanly rebases on top
of the present patch.
--
Luca
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] legal-info: fix detection of "override" packages
2016-03-04 23:39 [Buildroot] [PATCH 1/2] legal-info: fix detection of "override" packages Luca Ceresoli
2016-03-04 23:39 ` [Buildroot] [PATCH 2/2] legal-info: remove outdated comment Luca Ceresoli
@ 2016-03-06 10:13 ` Yann E. MORIN
2016-03-06 13:34 ` Thomas Petazzoni
2 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2016-03-06 10:13 UTC (permalink / raw)
To: buildroot
Luca, All,
On 2016-03-05 00:39 +0100, Luca Ceresoli spake thusly:
> The ifneq ($$($(2)_SITE_METHOD),override) test will always match
> because SITE_METHOD is never set to "override". The result is that
> some packages are downloaded and extracted unnecessarily, although
> they are (correctly) not saved in output/legal-info/.
>
> Fix by simply testing $(2)_OVERRIDE_SRCDIR instead: when empty, it
> indicates that the packages is neither a "local" site-method package
> nor a package that has its source directory overridden.
>
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
>
> Suggested by Thomas on:
> http://lists.busybox.net/pipermail/buildroot/2015-October/141032.html
> ---
> package/pkg-generic.mk | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index e22babbcd0c9..9ea2a707baa4 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -757,13 +757,11 @@ endif
> # non-local, and non-overriden. So only store, in the manifest, the tarball
> # name of those packages.
> ifeq ($$($(2)_REDISTRIBUTE),YES)
> -ifneq ($$($(2)_SITE_METHOD),local)
> -ifneq ($$($(2)_SITE_METHOD),override)
> +ifeq ($$($(2)_OVERRIDE_SRCDIR),)
> # Packages that have a tarball need it downloaded beforehand
> $(1)-legal-info: $(1)-source $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))
> endif
> endif
> -endif
>
> # If FOO_ACTUAL_SOURCE_TARBALL is explicitly defined, it means FOO_SOURCE is
> # indeed a binary (e.g. external toolchain) and FOO_ACTUAL_SOURCE_TARBALL/_SITE
> --
> 1.9.1
>
--
.-----------------.--------------------.------------------.--------------------.
| 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. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH 1/2] legal-info: fix detection of "override" packages
2016-03-04 23:39 [Buildroot] [PATCH 1/2] legal-info: fix detection of "override" packages Luca Ceresoli
2016-03-04 23:39 ` [Buildroot] [PATCH 2/2] legal-info: remove outdated comment Luca Ceresoli
2016-03-06 10:13 ` [Buildroot] [PATCH 1/2] legal-info: fix detection of "override" packages Yann E. MORIN
@ 2016-03-06 13:34 ` Thomas Petazzoni
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2016-03-06 13:34 UTC (permalink / raw)
To: buildroot
Dear Luca Ceresoli,
On Sat, 5 Mar 2016 00:39:12 +0100, Luca Ceresoli wrote:
> The ifneq ($$($(2)_SITE_METHOD),override) test will always match
> because SITE_METHOD is never set to "override". The result is that
> some packages are downloaded and extracted unnecessarily, although
> they are (correctly) not saved in output/legal-info/.
>
> Fix by simply testing $(2)_OVERRIDE_SRCDIR instead: when empty, it
> indicates that the packages is neither a "local" site-method package
> nor a package that has its source directory overridden.
>
> Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
> Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> ---
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-03-06 22:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-04 23:39 [Buildroot] [PATCH 1/2] legal-info: fix detection of "override" packages Luca Ceresoli
2016-03-04 23:39 ` [Buildroot] [PATCH 2/2] legal-info: remove outdated comment Luca Ceresoli
2016-03-06 10:19 ` Yann E. MORIN
2016-03-06 22:52 ` Luca Ceresoli
2016-03-06 10:13 ` [Buildroot] [PATCH 1/2] legal-info: fix detection of "override" packages Yann E. MORIN
2016-03-06 13:34 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox