From: Luca Ceresoli <luca@lucaceresoli.net>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] legal-info: extract even no-redistribute packages
Date: Fri, 14 Mar 2014 00:24:05 +0100 [thread overview]
Message-ID: <53223E15.5000504@lucaceresoli.net> (raw)
In-Reply-To: <1394663367-11778-1-git-send-email-yann.morin.1998@free.fr>
Hi Yann,
Yann E. MORIN wrote:
> From: "Yann E. MORIN" <yann.morin.1998@free.fr>
>
> Currently, if a package is marked _REDISTRIBUTE = NO, then legal-info
> will not try to extract it first.
>
> If that package also declares some _LICENSE_FILES, legal-info fails
> if it is the only action we're trying to run:
>
> $ cat defconfig
> BR2_INIT_NONE=y
> BR2_PACKAGE_LIBFSLCODEC=y
> $ make BR2_DEFCONFIG=$(pwd)/defconfig defconfig
> $ make libfslcodec-legal-info
> /bin/sh: /home/ymorin/dev/buildroot/O/legal-info/licenses.txt: No such file or directory
> make[1]: *** [libfslcodec-legal-info] Error 1
>
> Fix this by always having legal-info extract the archives if one or
> more _LICENSE_FILES are specified.
>
> We do this for all types of packages: overriden, local or 'normal'
> remote packages. Even though we do not save the sources for the
> overriden or local packages, we need to save their licensing info,
> so we need to extract them.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com>
> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> Cc: Fabio Porcedda <fabio.porcedda@gmail.com>
>
> Chamges v1 -> v2:
> - this is not fixing the autobuilders failure it was written to fix
> so remove the references to such build failures (Thomas P)
> - also extract overriden and local packages (Fabio)
> ---
> package/pkg-generic.mk | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index 339c3eb..d201a77 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -555,15 +555,13 @@ $(2)_MANIFEST_LICENSE_FILES = $$($(2)_LICENSE_FILES)
> endif
> $(2)_MANIFEST_LICENSE_FILES ?= not saved
>
> -ifeq ($$($(2)_REDISTRIBUTE),YES)
> -ifneq ($$($(2)_SITE_METHOD),local)
> -ifneq ($$($(2)_SITE_METHOD),override)
> +# If the package declares _LICENSE_FILES, we need to extract it,
> +# for overriden, local or normal remote packages alike.
> +ifneq ($$($(2)_LICENSE_FILES),)
> # Packages that have a tarball need it downloaded and extracted beforehand
> $(1)-legal-info: $(1)-extract $(REDIST_SOURCES_DIR_$(call UPPERCASE,$(4)))
> $(2)_MANIFEST_TARBALL = $$($(2)_SOURCE)
> endif
> -endif
> -endif
You're right Yann.
Not only we need to extract the sources in order to copy the license
files.
We also do _not_ need the extract step in order to save the tarball:
that was useless (although not harmful -- only wasting a little time).
As far as the overridden and local packages are concerned, I've always
found them very useful during development but not for integration,
when legal-info becomes useful. So I have no strong opinion.
However, if somebody really uses them for integration and they do work,
then it's correct to extract them for legal-info. If nobody does, then
the question is irrelevant. So I'm fine with your proposed patch, and
I like the fact that it removes 5 lines and adds only 1 (comments
excluded)!
[tested before and after the patch, enabling and disabling the
_REDISTRIBUTE and _LICENSE_FILES attributes for a sample package]
Tested-by: Luca Ceresoli <luca@lucaceresoli.net>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
--
Luca
next prev parent reply other threads:[~2014-03-13 23:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-12 22:29 [Buildroot] [PATCH] legal-info: extract even no-redistribute packages Yann E. MORIN
2014-03-13 11:52 ` Thomas De Schampheleire
2014-03-13 23:24 ` Luca Ceresoli [this message]
2014-03-14 21:40 ` Yann E. MORIN
-- strict thread matches above, loose matches on Subject: below --
2014-02-28 16:45 Yann E. MORIN
2014-02-28 19:16 ` Thomas Petazzoni
2014-02-28 23:39 ` Fabio Porcedda
2014-03-01 13:19 ` Yann E. MORIN
2014-03-01 13:36 ` Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53223E15.5000504@lucaceresoli.net \
--to=luca@lucaceresoli.net \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox