diff options
author | Mike Crowe <mac@mcrowe.com> | 2021-07-12 16:35:58 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-13 14:27:53 +0100 |
commit | 72e4483f127c6065c487f550765ed18e72183ff3 (patch) | |
tree | 90a1507d5ad6e4a4a16d178d51ab290d6c0302df /meta | |
parent | b59f420deaf15fe20a2bc7ee4edef698f5592f44 (diff) | |
download | poky-72e4483f127c6065c487f550765ed18e72183ff3.tar.gz |
licence_image: Add lic-pkgs IMAGE_FEATURE
Installing license packages is similar to installing -dev or -dbg
packages, so let's invent a "lic-pkgs" IMAGE_FEATURE that does so and
document it in core-image.bbclass.
This image feature only works if LICENSE_CREATE_PACKAGE is set, so
refuse to generate an image if the lic-pkgs feature is enabled without
LICENSE_CREATE_PACKAGE.
(From OE-Core rev: eee8179f5b920d3f8907db23cbc061ed6770a02a)
Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/core-image.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/license_image.bbclass | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index d81f68bd2e..84fd3eeb38 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass | |||
@@ -31,6 +31,8 @@ | |||
31 | # - post-install-logging | 31 | # - post-install-logging |
32 | # - dev-pkgs - development packages (headers, etc.) for all installed packages in the rootfs | 32 | # - dev-pkgs - development packages (headers, etc.) for all installed packages in the rootfs |
33 | # - dbg-pkgs - debug symbol packages for all installed packages in the rootfs | 33 | # - dbg-pkgs - debug symbol packages for all installed packages in the rootfs |
34 | # - lic-pkgs - license packages for all installed pacakges in the rootfs, requires | ||
35 | # LICENSE_CREATE_PACKAGE="1" to be set when building packages too | ||
34 | # - doc-pkgs - documentation packages for all installed packages in the rootfs | 36 | # - doc-pkgs - documentation packages for all installed packages in the rootfs |
35 | # - bash-completion-pkgs - bash-completion packages for recipes using bash-completion bbclass | 37 | # - bash-completion-pkgs - bash-completion packages for recipes using bash-completion bbclass |
36 | # - ptest-pkgs - ptest packages for all ptest-enabled recipes | 38 | # - ptest-pkgs - ptest packages for all ptest-enabled recipes |
diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass index 73cebb4d55..5dbec288a4 100644 --- a/meta/classes/license_image.bbclass +++ b/meta/classes/license_image.bbclass | |||
@@ -1,5 +1,15 @@ | |||
1 | ROOTFS_LICENSE_DIR = "${IMAGE_ROOTFS}/usr/share/common-licenses" | 1 | ROOTFS_LICENSE_DIR = "${IMAGE_ROOTFS}/usr/share/common-licenses" |
2 | 2 | ||
3 | # This requires LICENSE_CREATE_PACKAGE=1 to work too | ||
4 | COMPLEMENTARY_GLOB[lic-pkgs] = "*-lic" | ||
5 | |||
6 | python() { | ||
7 | if not oe.data.typed_value('LICENSE_CREATE_PACKAGE', d): | ||
8 | features = set(oe.data.typed_value('IMAGE_FEATURES', d)) | ||
9 | if 'lic-pkgs' in features: | ||
10 | bb.error("'lic-pkgs' in IMAGE_FEATURES but LICENSE_CREATE_PACKAGE not enabled to generate -lic packages") | ||
11 | } | ||
12 | |||
3 | python write_package_manifest() { | 13 | python write_package_manifest() { |
4 | # Get list of installed packages | 14 | # Get list of installed packages |
5 | license_image_dir = d.expand('${LICENSE_DIRECTORY}/${IMAGE_NAME}') | 15 | license_image_dir = d.expand('${LICENSE_DIRECTORY}/${IMAGE_NAME}') |