package/googlefontdirectory: better solution to avoid check-package warning
PATCH 1/1 package/googlefontdirectory: better solution to avoid check-package warning
Rather than tell check-package to ignore a false-positive issue, just avoid the issue to begin with, by using an intermediate variable to construct the list of licenses.
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Thomas Petazzoni <[email protected]>
--- package/googlefontdirectory/googlefontdirectory.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
package/googlefontdirectory/googlefontdirectory.mk +4 -5
@@ -11,22 +11,21 @@ GOOGLEFONTDIRECTORY_FONTS = \ $(call qstrip,$(BR2_PACKAGE_GOOGLEFONTDIRECTORY_FONTS)) ifneq ($(filter apache/%,$(GOOGLEFONTDIRECTORY_FONTS)),) -GOOGLEFONTDIRECTORY_LICENSE += Apache-2.0 +GOOGLEFONTDIRECTORY_ALL_LICENSES += Apache-2.0 GOOGLEFONTDIRECTORY_LICENSE_FILES += $(addsuffix /LICENSE.txt,$(filter apache/%,$(GOOGLEFONTDIRECTORY_FONTS))) endif ifneq ($(filter ofl/%,$(GOOGLEFONTDIRECTORY_FONTS)),) -GOOGLEFONTDIRECTORY_LICENSE += OFL-1.1 +GOOGLEFONTDIRECTORY_ALL_LICENSES += OFL-1.1 GOOGLEFONTDIRECTORY_LICENSE_FILES += $(addsuffix /OFL.txt,$(filter ofl/%,$(GOOGLEFONTDIRECTORY_FONTS))) endif ifneq ($(filter ufl/%,$(GOOGLEFONTDIRECTORY_FONTS)),) -GOOGLEFONTDIRECTORY_LICENSE += UFL-1.1 +GOOGLEFONTDIRECTORY_ALL_LICENSES += UFL-1.1 GOOGLEFONTDIRECTORY_LICENSE_FILES += $(addsuffix /LICENCE.txt,$(filter ufl/%,$(GOOGLEFONTDIRECTORY_FONTS))) endif -# check-package OverriddenVariable -GOOGLEFONTDIRECTORY_LICENSE := $(subst $(space),$(comma)$(space),$(GOOGLEFONTDIRECTORY_LICENSE)) +GOOGLEFONTDIRECTORY_LICENSE = $(subst $(space),$(comma)$(space),$(GOOGLEFONTDIRECTORY_ALL_LICENSES)) define GOOGLEFONTDIRECTORY_INSTALL_TARGET_CMDS $(foreach d,$(GOOGLEFONTDIRECTORY_FONTS), \
Signature · 1 line
2.14.1
Thomas Petazzoni
AppliedPATCH 1/1 package/googlefontdirectory: better solution to avoid check-package warning
Quoted 9 lines · On Sun, 10 Feb 2019 16:48:15 +0100 "Yann E. MORIN" <[email protected]>…
Rather than tell check-package to ignore a false-positive issue, just avoid the issue to begin with, by using an intermediate variable to construct the list of licenses.
Signed-off-by "Yann E. MORIN" <[email protected]>Cc Thomas Petazzoni <[email protected]>--- package/googlefontdirectory/googlefontdirectory.mk | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com