core/legal-info: don't generate big file with all license texts

By aggregating all the license files into a single big text-only file
means we have no way to use license files that are binary blobs (e.g.
pdf, rtf...).

Just do not generate that big file; if the user still wants it, it is
very easy to create it afterwards.

Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Luca Ceresoli <luca@lucaceresoli.net>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/Makefile b/Makefile
index 5e4daefae793986a745a60fbc69c892d0d44a96a..74b831eadf188e92252ebc4566f7c5d15acd29e9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -195,8 +195,6 @@ 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_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
 

diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk
index 68ead3d1bb216a2477a7e20a0fba057f31e6888b..1a37b1258035eb12c26341eeca0d86fed4450a98 100644 (file)
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -808,7 +808,6 @@ ifneq ($$(call qstrip,$$($(2)_SOURCE)),)
 # 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)_RAW_BASE_NAME),$$(call UPPERCASE,$(4)))
        @$$(call legal-warning-pkg,$$($(2)_RAW_BASE_NAME),cannot save license ($(2)_LICENSE_FILES not defined))
 else
        @$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAW_BASE_NAME),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep))

diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
index 28db4813e207f64b6024e307a653ee60daa346f6..c5d4080c72f4227ce643ae4549f6600057bc715e 100644 (file)
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -75,19 +75,7 @@ define legal-manifest # pkg, version, license, license-files, source, url, {HOST
        echo '"$(1)","$(2)","$(3)","$(4)","$(5)","$(6)"' >>$(LEGAL_MANIFEST_CSV_$(7))
 endef
 
-define legal-license-header # pkg, license-file, {HOST|TARGET}
-       printf "$(LEGAL_INFO_SEPARATOR)\n\t$(1):\
-               $(2)\n$(LEGAL_INFO_SEPARATOR)\n\n\n" >>$(LEGAL_LICENSES_TXT_$(3))
-endef
-
-define legal-license-nofiles # pkg, {HOST|TARGET}
-       $(call legal-license-header,$(1),unknown license file(s),$(2))
-endef
-
 define legal-license-file # pkg, filename, file-fullpath, {HOST|TARGET}
-       $(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