From: Thomas De Schampheleire <patrickdepinguin@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 3 of 5] legal-info: split license texts for host and target
Date: Fri, 04 Oct 2013 15:12:32 +0200 [thread overview]
Message-ID: <e6a358594ba5b49cdf7e.1380892352@argentina> (raw)
In-Reply-To: <patchbomb.1380892349@argentina>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
---
Makefile | 8 +++++---
package/pkg-generic.mk | 2 +-
package/pkg-utils.mk | 16 ++++++++--------
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
--- 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
@@ -588,7 +590,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
--- a/package/pkg-generic.mk
+++ b/package/pkg-generic.mk
@@ -508,7 +508,7 @@ else
# Other packages
# 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
@$(foreach F,$$($(2)_LICENSE_FILES),$(call legal-license-file,$$($(2)_RAWNAME),$(F),$$($(2)_DIR)/$(F),$(call UPPERCASE,$(5)))$$(sep))
diff --git a/package/pkg-utils.mk b/package/pkg-utils.mk
--- a/package/pkg-utils.mk
+++ b/package/pkg-utils.mk
@@ -99,15 +99,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
next prev parent reply other threads:[~2013-10-04 13:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-04 13:12 [Buildroot] [PATCH 0 of 5] legal info: split host and package output Thomas De Schampheleire
2013-10-04 13:12 ` [Buildroot] [PATCH 1 of 5] legal info: fix saving of host package licenses Thomas De Schampheleire
2013-10-04 13:24 ` Thomas De Schampheleire
2013-10-04 15:29 ` Thomas De Schampheleire
2013-10-07 15:01 ` Thomas De Schampheleire
2013-10-04 13:12 ` [Buildroot] [PATCH 2 of 5] legal info: split manifest for host and target Thomas De Schampheleire
2013-10-04 13:12 ` Thomas De Schampheleire [this message]
2013-10-04 14:08 ` [Buildroot] [PATCH 3 of 5] legal-info: split license texts " Thomas De Schampheleire
2013-10-05 21:28 ` Luca Ceresoli
2013-10-04 13:12 ` [Buildroot] [PATCH 4 of 5] legal info: split sources " Thomas De Schampheleire
2013-10-05 21:29 ` Luca Ceresoli
2013-10-04 13:12 ` [Buildroot] [PATCH 5 of 5] legal info: cleanup utility functions Thomas De Schampheleire
2013-10-05 21:19 ` Luca Ceresoli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e6a358594ba5b49cdf7e.1380892352@argentina \
--to=patrickdepinguin@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox