legal info: split manifest for host and target
PATCH 1/1 legal info: split manifest for host and target
--- Makefile | 8 +++++--- docs/manual/legal-notice.txt | 6 +++--- package/pkg-generic.mk | 2 +- package/pkg-utils.mk | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-)
Note: I tried hundreds of things, but couldn't find the correct way of using
$(2)_TYPE correctly in the call to legal-manifest, I can only make it work with
$(5). I'm currently dollar-sign-dizzy:
@$(call legal-manifest,$$($(2)_RAWNAME),$$($(2)_VERSION),$$($(2)_LICENSE),$$($(2)_MANIFEST_LICENSE_FILES),$$($(2)_MANIFEST_TARBALL),$(call UPPERCASE,$(5)))
Makefile +5 -3
@@ -272,7 +272,8 @@ TARGET_SKELETON=$(TOPDIR)/system/skeleto LEGAL_INFO_DIR=$(BASE_DIR)/legal-info REDIST_SOURCES_DIR=$(LEGAL_INFO_DIR)/sources LICENSE_FILES_DIR=$(LEGAL_INFO_DIR)/licenses -LEGAL_MANIFEST_CSV=$(LEGAL_INFO_DIR)/manifest.csv +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_WARNINGS=$(LEGAL_INFO_DIR)/.warnings LEGAL_REPORT=$(LEGAL_INFO_DIR)/README
@@ -588,8 +589,9 @@ legal-info-clean: legal-info-prepare: $(LEGAL_INFO_DIR) @$(call MESSAGE,"Collecting legal info") @$(call legal-license-file,buildroot,COPYING,COPYING) - @$(call legal-manifest,PACKAGE,VERSION,LICENSE,LICENSE FILES,SOURCE ARCHIVE) - @$(call legal-manifest,buildroot,$(BR2_VERSION_FULL),GPLv2+,COPYING,not saved) + @$(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) @$(call legal-warning,the Buildroot source code has not been saved) @$(call legal-warning,the toolchain has not been saved) @cp $(BUILDROOT_CONFIG) $(LEGAL_INFO_DIR)/buildroot.config
docs/manual/legal-notice.txt +3 -3
@@ -44,8 +44,8 @@ There you will find: saved); patches applied to some packages by Buildroot are distributed with the Buildroot sources and are not duplicated in the +sources/+ subdirectory. -* A manifest file listing the configured packages, their version, license and - related information. +* A manifest file (one for host and one for target packages) listing the + configured packages, their version, license and related information. Some of this information might not be defined in Buildroot; such items are marked as "unknown". * A +licenses/+ subdirectory, which contains the license text of packages.
@@ -72,7 +72,7 @@ License abbreviations --------------------- Here is a list of the licenses that are most widely used by packages in -Buildroot, with the name used in the manifest file: +Buildroot, with the name used in the manifest files: * `GPLv2`: http://www.gnu.org/licenses/old-licenses/gpl-2.0.html[
package/pkg-generic.mk +1 -1
@@ -519,7 +519,7 @@ ifeq ($$($(2)_REDISTRIBUTE),YES) cp $(DL_DIR)/$$($(2)_SOURCE) $(REDIST_SOURCES_DIR) endif endif - @$(call legal-manifest,$$($(2)_RAWNAME),$$($(2)_VERSION),$$($(2)_LICENSE),$$($(2)_MANIFEST_LICENSE_FILES),$$($(2)_MANIFEST_TARBALL)) + @$(call legal-manifest,$$($(2)_RAWNAME),$$($(2)_VERSION),$$($(2)_LICENSE),$$($(2)_MANIFEST_LICENSE_FILES),$$($(2)_MANIFEST_TARBALL),$(call UPPERCASE,$(5))) endif # ifneq ($(call qstrip,$$($(2)_SOURCE)),) $(foreach hook,$($(2)_POST_LEGAL_INFO_HOOKS),$(call $(hook))$(sep))
package/pkg-utils.mk +1 -1
@@ -96,7 +96,7 @@ legal-warning-pkg=echo "WARNING: $(1): $ define legal-warning-pkg-savednothing # pkg, {local|override} $(call legal-warning-pkg,$(1),sources and license files not saved ($(2) packages not handled)) endef -legal-manifest=echo '"$(1)","$(2)","$(3)","$(4)","$(5)"' >>$(LEGAL_MANIFEST_CSV) +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)
PATCH 1/1 legal info: split manifest for host and target
Quoted 11 lines · Thomas De Schampheleire
Signed-off-by Thomas De Schampheleire<[email protected]>--- Makefile | 8 +++++--- docs/manual/legal-notice.txt | 6 +++--- package/pkg-generic.mk | 2 +- package/pkg-utils.mk | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-)Note: I tried hundreds of things, but couldn't find the correct way of using $(2)_TYPE correctly in the call to legal-manifest,
Better not use $(2)_TYPE anyway, it's pretty much redundant.
Quoted 3 lines
I can only make it work with
$(5). I'm currently dollar-sign-dizzy:
@$(call legal-manifest,$$($(2)_RAWNAME),$$($(2)_VERSION),$$($(2)_LICENSE),$$($(2)_MANIFEST_LICENSE_FILES),$$($(2)_MANIFEST_TARBALL),$(call UPPERCASE,$(5)))
Regards,
Arnout
[snip]
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 1/1 legal info: split manifest for host and target
In reply to Thomas De SchampheleireQuoted 1 line · Thomas De Schampheleire
Signed-off-by Thomas De Schampheleire <[email protected]>
I like ticking away items from my todo list with so little effort. ;)
Signature · 1 line
Luca