[Buildroot] [PATCH 2/5] legal-info: save license files even for local or overriden packages
Luca Ceresoli
luca at lucaceresoli.net
Wed Jun 18 21:22:12 UTC 2014
Dear Yann,
Yann E. MORIN wrote:
> From: "Yann E. MORIN" <yann.morin.1998 at free.fr>
>
> Even if we do not save the sources for local or overrident packages because
s/overrident/overridden/
> it is too complex, we can still quite easily save the license files.
>
> Also, having the license files is a very important part of complying with
> the licenses.
>
> Move the copy of license files out of the non-local, non-overriden package
s/overriden/overridden/
> case, but still in the case where packages have a _SOURCE defined, to
> avoid catching packages bundled in Buildroot (eg. mkpasswd et al.)
>
> Reported-by: Luca Ceresoli <luca at lucaceresoli.net>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
> Cc: Luca Ceresoli <luca at lucaceresoli.net>
> Cc: Thomas De Schampheleire <patrickdepinguin at gmail.com>
> Cc: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
> Cc: Fabio Porcedda <fabio.porcedda at gmail.com>
>
> ---
> Changes v4 -> v5:
> - avoid warning for packages bundled in Buildroot (Luca)
> - the change is not a bout non-redistributable packages, but about
> local and overriden packages
> ---
> package/pkg-generic.mk | 25 +++++++++++++++----------
> 1 file changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
> index eb3ec9f..a978e63 100644
> --- a/package/pkg-generic.mk
> +++ b/package/pkg-generic.mk
> @@ -619,17 +619,12 @@ $(1)-legal-info:
> $(foreach hook,$($(2)_PRE_LEGAL_INFO_HOOKS),$(call $(hook))$(sep))
> ifneq ($(call qstrip,$$($(2)_SOURCE)),)
>
> -ifeq ($$($(2)_SITE_METHOD),local)
> -# Packages without a tarball: don't save and warn
> - @$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),local)
> -
> -else ifneq ($$($(2)_OVERRIDE_SRCDIR),)
> - @$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),override)
> -
> -else
> -# Other packages
> -
> # Save license files if defined
> +# We save the license files for any kind of package: normal, local,
> +# overriden, or non-redistributable alike.
s/overriden/overridden/
> +# The reason to save license files even for no-redistribute packages
> +# is that the license still applies to the files distributed as part
> +# of the rootfs, even if the sources are not themselves redistributed.
> ifeq ($(call qstrip,$$($(2)_LICENSE_FILES)),)
> @$(call legal-license-nofiles,$$($(2)_RAWNAME),$(call UPPERCASE,$(4)))
> @$(call legal-warning-pkg,$$($(2)_RAWNAME),cannot save license ($(2)_LICENSE_FILES not defined))
> @@ -640,6 +635,16 @@ else
> @$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$(F),$$($(2)_DIR)/$$(F),$(call UPPERCASE,$(4)))$$(sep))
> endif # license files
>
> +ifeq ($$($(2)_SITE_METHOD),local)
> +# Packages without a tarball: don't save and warn
> + @$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),local)
> +
> +else ifneq ($$($(2)_OVERRIDE_SRCDIR),)
> + @$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),override)
> +
> +else
> +# Other packages
> +
> ifeq ($$($(2)_REDISTRIBUTE),YES)
> # Copy the source tarball (just hardlink if possible)
> @cp -l $(DL_DIR)/$$($(2)_SOURCE) $(REDIST_SOURCES_DIR_$(call UPPERCASE,$(4))) 2>/dev/null || \
>
With the above fixed, and once rebased on top of master, and since I'm
OK with the actual code changes:
Reviewed-by: Luca Ceresoli <luca at lucaceresoli.net>
[Quick test on top of e00c631ef4aa, will test again once rebased]
Tested-by: Luca Ceresoli <luca at lucaceresoli.net>
--
Luca
More information about the buildroot
mailing list