From mboxrd@z Thu Jan 1 00:00:00 1970 From: Yann E. MORIN Date: Wed, 3 Feb 2016 23:22:05 +0100 Subject: [Buildroot] [PATCH 15/16 v4] core/legal-info: allow ignoring packages from the legal-info In-Reply-To: References: Message-ID: <253e0063036a336fec031744be65dae619103dd3.1454536753.git.yann.morin.1998@free.fr> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net It might be necessary to not even mention a package in the output of legal-info: - virtual packages have virtually nothing to save in the legal-info output; - for Buildroot itself, host-gcc-initial and host-gcc-final are not real packages, they are just two different steps of the same package, gcc; - for proprietary packages, it might not even be legal to even mention them, being under NDA or some other such restrictive conditions. Introduce the new FOO_LEGAL_INGORE variable that a package can set to 'YES' (default to 'NO') to indicate that the package should be completely ignored from the legal-info output, in which case the package is not mentioned in the maniufest, its source archive, patches and license files are not saved into legal-info/ . Signed-off-by: "Yann E. MORIN" Cc: Luca Ceresoli Cc: Thomas Petazzoni Cc: Peter Korsgaard Reviewed-by: Luca Ceresoli Tested-by: Luca Ceresoli --- Changes v1 -> v2: - introduce a new variable, instead of making _REDISTRIBUTE a tri-state (Thomas, Peter, Luca) --- docs/manual/adding-packages-generic.txt | 9 +++++++++ package/pkg-generic.mk | 15 +++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index b7817e3..26a7b6c 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -421,6 +421,15 @@ information is (assuming the package name is +libfoo+) : non-opensource packages: Buildroot will not save the source code for this package when collecting the +legal-info+. +* +LIBFOO_LEGAL_IGNORE+ can be set to +YES+ or +NO+ (the default) to indicate + that this package should be completely ignored when saving the licensing + information. If set to +YES+, then the package is not listed in the manifest, + its source archive and its license files are not saved. You probably do not + want to set it to +YES+, unless under very specific conditions (e.g. when + you use the `legal-info/` output directory as-is to provide a compliance + delivery, and do not want your proprietary, non-redistributable packages to + even be mentioned in the manifest). + * +LIBFOO_FLAT_STACKSIZE+ defines the stack size of an application built into the FLAT binary format. The application stack size on the NOMMU architecture processors can't be enlarged at run time. The default stack size for the diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index ec93416..9acc869 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -496,6 +496,14 @@ endif $(2)_REDISTRIBUTE ?= YES +ifndef $(2)_LEGAL_IGNORE + ifdef $(3)_LEGAL_IGNORE + $(2)_LEGAL_IGNORE = $$($(3)_LEGAL_IGNORE) + endif +endif + +$(2)_LEGAL_IGNORE ?= NO + $(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_RAWNAME_VERSION) # When a target package is a toolchain dependency set this variable to @@ -779,7 +787,10 @@ $(2)_MANIFEST_LICENSE_FILES ?= not saved # We need to extract and patch a package to be able to retrieve its # license files (if any) and the list of patches applied to it (if # any). +# But not if we want to ignore that package completely. +ifneq ($$($(2)_LEGAL_IGNORE),YES) $(1)-legal-info: $(1)-patch +endif # We only save the sources of packages we want to redistribute, that are # non-local, and non-overriden. So only store, in the manifest, the tarball @@ -795,6 +806,8 @@ endif # legal-info: produce legally relevant info. $(1)-legal-info: +ifneq ($$($(2)_LEGAL_IGNORE),YES) + # Packages without a source are assumed to be part of Buildroot, skip them. $$(foreach hook,$$($(2)_PRE_LEGAL_INFO_HOOKS),$$(call $$(hook))$$(sep)) ifneq ($$(call qstrip,$$($(2)_SOURCE)),) @@ -848,6 +861,8 @@ endif # other packages endif # ifneq ($$(call qstrip,$$($(2)_SOURCE)),) $$(foreach hook,$$($(2)_POST_LEGAL_INFO_HOOKS),$$(call $$(hook))$$(sep)) +endif # $(2)_LEGAL_IGNORE != YES + # add package to the general list of targets if requested by the buildroot # configuration ifeq ($$($$($(2)_KCONFIG_VAR)),y) -- 1.9.1