diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-12-15 16:55:10 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-19 18:08:00 +0000 |
commit | 5f78cf9b4ee56937298eaa55a6fddabae8dd8bd4 (patch) | |
tree | ed6f1ec3647ddd2839cc2fcbceec0599c965ff88 /meta/conf | |
parent | fc518325c64040e6bbd47cfb7f40f0fd363c17d2 (diff) | |
download | poky-5f78cf9b4ee56937298eaa55a6fddabae8dd8bd4.tar.gz |
base/license.bbclass: expand wildcards in INCOMPATIBLE_LICENSE
The whitelist processing in code in base.bbclass does not play well with
wildcards in INCOMPATIBLE_LICENSES. The code expects bad_licenses to
contain actual license names, not wildcards.
Add incompatible_license_contains to replace bb.utils.contains(
"INCOMPATIBLE_LICENSE", **, **, **, d)
[YOCTO #5592]
(From OE-Core rev: 3587653a8d8abc7cfed6a5c6ecfa72bee283e451)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/documentation.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index 5564316bb3..2ab86e1487 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf | |||
@@ -223,7 +223,7 @@ IMAGE_ROOTFS_EXTRA_SPACE[doc] = "Defines additional free disk space created in t | |||
223 | IMAGE_ROOTFS_SIZE[doc] = "Defines the size in Kbytes for the generated image." | 223 | IMAGE_ROOTFS_SIZE[doc] = "Defines the size in Kbytes for the generated image." |
224 | IMAGE_TYPES[doc] = "Specifies the complete list of supported image types by default." | 224 | IMAGE_TYPES[doc] = "Specifies the complete list of supported image types by default." |
225 | INC_PR[doc] = "Helps define the recipe revision for recipes that share a common include file." | 225 | INC_PR[doc] = "Helps define the recipe revision for recipes that share a common include file." |
226 | INCOMPATIBLE_LICENSE[doc] = "Specifies a space-separated list of license names (as they would appear in LICENSE) that should be excluded from the build." | 226 | INCOMPATIBLE_LICENSE[doc] = "Specifies a space-separated list of license names (as they would appear in LICENSE) that should be excluded from the build. Wildcard is supported, such as '*GPLv3'" |
227 | INHIBIT_DEFAULT_DEPS[doc] = "Prevents the default dependencies, namely the C compiler and standard C library (libc), from being added to DEPENDS." | 227 | INHIBIT_DEFAULT_DEPS[doc] = "Prevents the default dependencies, namely the C compiler and standard C library (libc), from being added to DEPENDS." |
228 | INHIBIT_PACKAGE_STRIP[doc] = "If set to "1", causes the build to not strip binaries in resulting packages." | 228 | INHIBIT_PACKAGE_STRIP[doc] = "If set to "1", causes the build to not strip binaries in resulting packages." |
229 | INHERIT[doc] = "Causes the named class to be inherited at this point during parsing. The variable is only valid in configuration files." | 229 | INHERIT[doc] = "Causes the named class to be inherited at this point during parsing. The variable is only valid in configuration files." |