legal info: split license texts for host and target

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Acked-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/Makefile b/Makefile
index d5b3473c3595011f147fca1a08e48f14ffd68c08..da2a646866a8db5f2ef72ba9e4eaa7ec44af49ee 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -109,10 +109,12 @@ HOST_DIR:=$(BASE_DIR)/host
 
 LEGAL_INFO_DIR=$(BASE_DIR)/legal-info
 REDIST_SOURCES_DIR=$(LEGAL_INFO_DIR)/sources
-LICENSE_FILES_DIR=$(LEGAL_INFO_DIR)/licenses
+LICENSE_FILES_DIR_TARGET=$(LEGAL_INFO_DIR)/licenses
+LICENSE_FILES_DIR_HOST=$(LEGAL_INFO_DIR)/host-licenses
 LEGAL_MANIFEST_CSV_TARGET=$(LEGAL_INFO_DIR)/manifest.csv
 LEGAL_MANIFEST_CSV_HOST=$(LEGAL_INFO_DIR)/host-manifest.csv
-LEGAL_LICENSES_TXT=$(LEGAL_INFO_DIR)/licenses.txt
+LEGAL_LICENSES_TXT_TARGET=$(LEGAL_INFO_DIR)/licenses.txt
+LEGAL_LICENSES_TXT_HOST=$(LEGAL_INFO_DIR)/host-licenses.txt
 LEGAL_WARNINGS=$(LEGAL_INFO_DIR)/.warnings
 LEGAL_REPORT=$(LEGAL_INFO_DIR)/README
 
@@ -575,7 +577,7 @@ legal-info-clean:
 
 legal-info-prepare: $(LEGAL_INFO_DIR)
        @$(call MESSAGE,"Collecting legal info")
-       @$(call legal-license-file,buildroot,COPYING,COPYING)
+       @$(call legal-license-file,buildroot,COPYING,COPYING,HOST)
        @$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,TARGET)
        @$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE,HOST)
        @$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPLv2+,COPYING,not saved,HOST)

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index a11b21da3931cf03f75ab24078dc0c57d9d53ae7..5e3fd390107e9399300838eb9df8b489d675e16b 100644 (file)
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -575,13 +575,13 @@ else
 
 # Save license files if defined
 ifeq ($(call qstrip,$$($(2)_LICENSE_FILES)),)
-       @$(call legal-license-nofiles,$$($(2)_RAWNAME))
+       @$(call legal-license-nofiles,$$($(2)_RAWNAME),$(call UPPERCASE,$(5)))
        @$(call legal-warning-pkg,$$($(2)_RAWNAME),cannot save license ($(2)_LICENSE_FILES not defined))
 else
 # Double dollar signs are really needed here, to catch host packages
 # without explicit HOST_FOO_LICENSE_FILES assignment, also in case they
 # have multiple license files.
-       @$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$(F),$$($(2)_DIR)/$$(F))$$(sep))
+       @$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAWNAME),$$(F),$$($(2)_DIR)/$$(F),$(call UPPERCASE,$(5)))$$(sep))
 endif # license files
 
 ifeq ($$($(2)_REDISTRIBUTE),YES)

diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index f7400614b1b8c9aed2a9d4b6b8f60b971ca1033f..86fa5da870668fde4b7f66b99a4cadc66f080d74 100644 (file)
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -107,15 +107,15 @@ endef
 legal-manifest=echo '"$(1)","$(2)","$(3)","$(4)","$(5)"' >>$(LEGAL_MANIFEST_CSV_$(6))
 define legal-license-header
        echo -e "$(LEGAL_INFO_SEPARATOR)\n\t$(1):" \
-               "$(2)\n$(LEGAL_INFO_SEPARATOR)\n\n" >>$(LEGAL_LICENSES_TXT)
+               "$(2)\n$(LEGAL_INFO_SEPARATOR)\n\n" >>$(LEGAL_LICENSES_TXT_$(3))
 endef
 define legal-license-nofiles
-       $(call legal-license-header,$(1),unknown license file(s))
+       $(call legal-license-header,$(1),unknown license file(s),$(2))
 endef
-define legal-license-file # pkg, filename, file-fullpath
-       $(call legal-license-header,$(1),$(2) file) && \
-       cat $(3) >>$(LEGAL_LICENSES_TXT) && \
-       echo >>$(LEGAL_LICENSES_TXT) && \
-       mkdir -p $(LICENSE_FILES_DIR)/$(1)/$(dir $(2)) && \
-       cp $(3) $(LICENSE_FILES_DIR)/$(1)/$(2)
+define legal-license-file # pkg, filename, file-fullpath, type
+       $(call legal-license-header,$(1),$(2) file,$(4)) && \
+       cat $(3) >>$(LEGAL_LICENSES_TXT_$(4)) && \
+       echo >>$(LEGAL_LICENSES_TXT_$(4)) && \
+       mkdir -p $(LICENSE_FILES_DIR_$(4))/$(1)/$(dir $(2)) && \
+       cp $(3) $(LICENSE_FILES_DIR_$(4))/$(1)/$(2)
 endef