Updates the variable documentation to indicate that they now deal with SPDX License identifier and expressions.
Signed-off-by: Joshua Watt <[email protected]> --- meta/conf/documentation.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index 842cf31739..1a6ec8fdd5 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf @@ -214,7 +214,8 @@ IMAGE_ROOTFS_EXTRA_SPACE[doc] = "Defines additional free disk space created in t IMAGE_ROOTFS_MAXSIZE[doc] = "Defines the maximum size in Kbytes for the generated image." IMAGE_ROOTFS_SIZE[doc] = "Defines the size in Kbytes for the generated image." IMAGE_TYPES[doc] = "Specifies the complete list of supported image types by default." -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 '*GPL-3.0*'" +INCOMPATIBLE_LICENSE[doc] = "Specifies a space-separated list of SPDX Licenses or SPDX Exceptions (as they would appear in LICENSE) that should be excluded from the build. Wildcard is supported, such as '*GPL-3.0*'" +INCOMPATIBLE_LICENSE_EXCEPTIONS[doc] = "Specifies a space-separated list of SPDX Licenses or SPDX Exceptions (as they would appear in LICENSE) that should be allowed in the build, even if they would otherwise match INCOMPATIBLE_LICENSE" INHIBIT_DEFAULT_DEPS[doc] = "Prevents the default dependencies, namely the C compiler and standard C library (libc), from being added to DEPENDS." INHIBIT_PACKAGE_STRIP[doc] = "If set to "1", causes the build to not strip binaries in resulting packages." INHERIT[doc] = "Causes the named class to be inherited at this point during parsing. The variable is only valid in configuration files." @@ -254,7 +255,7 @@ LAYERDIR[doc] = "When used inside the layer.conf configuration file, this variab LAYERVERSION[doc] = "Optionally specifies the version of a layer as a single number. This variable is used in the conf/layer.conf file and must be suffixed with the name of the specific layer." LEAD_SONAME[doc] = "Specifies the lead (or primary) compiled library file (.so) that the debian class applies its naming policy to given a recipe that packages multiple libraries." LIC_FILES_CHKSUM[doc] = "Checksums of the license text in the recipe source code." -LICENSE[doc] = "The list of source licenses for the recipe. Logical operators '&' or '|' and parentheses can be used." +LICENSE[doc] = "The source license for the recipe as a SPDX License expression" LICENSE_FLAGS[doc] = "List of commercial or other special licensing terms which must be explicitly approved through LICENSE_FLAGS_ACCEPTED." LICENSE_FLAGS_ACCEPTED[doc] = "List of accepted licensing terms matching LICENSE_FLAGS." LICENSE_FLAGS_DETAILS[doc] = "Gives more details about a specific license found in LICENSE_FLAGS." -- 2.54.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#241491): https://lists.openembedded.org/g/openembedded-core/message/241491 Mute This Topic: https://lists.openembedded.org/mt/120366691/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
