From 8d42b6d04516803c4a86c8e02b729d95df9c9415 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 22 Jun 2014 14:41:15 +0200 Subject: [PATCH] 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: "Yann E. MORIN" Cc: Luca Ceresoli Cc: Thomas De Schampheleire Cc: Thomas Petazzoni Cc: Fabio Porcedda Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 4 ++-- package/pkg-utils.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 851ae0f4ab..78fe1346ce 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -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 diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk index 163ef8a07c..59a5ab2cc2 100644 --- a/package/pkg-utils.mk +++ b/package/pkg-utils.mk @@ -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} -- 2.30.2