Commit 8d42b6d0 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

legal-info: rename legal-warning-pkg-savednothing helper 



This helper was called when none of the sources or license
files were saved.

Now we handle license files separately from the sources,
this is no longer the case: they are only called when the
sources are not saved.

Rename the handler and change the warning message accordingly.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Luca Ceresoli <luca@lucaceresoli.net>
Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Fabio Porcedda <fabio.porcedda@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 1da3f174

package/pkg-generic.mk

+2 −2
Original line number Diff line number Diff line
@@ -662,10 +662,10 @@ 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)

	@$$(call legal-warning-nosource,$$($(2)_RAWNAME),local)



else ifneq ($$($(2)_OVERRIDE_SRCDIR),)

	@$$(call legal-warning-pkg-savednothing,$$($(2)_RAWNAME),override)

	@$$(call legal-warning-nosource,$$($(2)_RAWNAME),override)



else

# Other packages

package/pkg-utils.mk

+2 −2
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ define legal-warning-pkg # pkg, text 
	echo "WARNING: $(1): $(2)" >>$(LEGAL_WARNINGS)

endef



define legal-warning-pkg-savednothing # pkg, {local|override}

	$(call legal-warning-pkg,$(1),sources and license files not saved ($(2) packages not handled))

define legal-warning-nosource # pkg, {local|override}

	$(call legal-warning-pkg,$(1),sources not saved ($(2) packages not handled))

endef



define legal-manifest # pkg, version, license, license-files, source, {HOST|TARGET}