diff options
author | Leon Anavi <leon.anavi@konsulko.com> | 2024-01-31 16:28:58 +0200 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2024-02-20 07:40:39 -0500 |
commit | 06979d554847d413cc59a219a60d3c4f6073aeed (patch) | |
tree | 016bff3eb002196e9f50422b0a170d155473b9e4 | |
parent | d444b7d7dad2c3b7c86b17dc0eff3500111b427f (diff) | |
download | meta-security-06979d554847d413cc59a219a60d3c4f6073aeed.tar.gz |
integrity-image-minimal: Fix IMAGE_INSTALL
Append to IMAGE_INSTALL rather than directly setting the variable
and does it after inheriting core-image.bbclass because in it
IMAGE_INSTALL is set with a default value CORE_IMAGE_BASE_INSTALL.
Variable CORE_IMAGE_BASE_INSTALL includes CORE_IMAGE_EXTRA_INSTALL
so the change allows adding auditd to CORE_IMAGE_EXTRA_INSTALL as
per the instructions in meta-integrity/README.md.
Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-integrity/recipes-core/images/integrity-image-minimal.bb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/meta-integrity/recipes-core/images/integrity-image-minimal.bb b/meta-integrity/recipes-core/images/integrity-image-minimal.bb index 5022170..856249f 100644 --- a/meta-integrity/recipes-core/images/integrity-image-minimal.bb +++ b/meta-integrity/recipes-core/images/integrity-image-minimal.bb | |||
@@ -2,18 +2,16 @@ DESCRIPTION = "An image as an exmaple for Ima support" | |||
2 | 2 | ||
3 | IMAGE_FEATURES += "ssh-server-openssh" | 3 | IMAGE_FEATURES += "ssh-server-openssh" |
4 | 4 | ||
5 | LICENSE = "MIT" | ||
6 | |||
7 | inherit core-image | ||
5 | 8 | ||
6 | IMAGE_INSTALL = "\ | 9 | IMAGE_INSTALL += "\ |
7 | packagegroup-base \ | 10 | packagegroup-base \ |
8 | packagegroup-core-boot \ | 11 | packagegroup-core-boot \ |
9 | packagegroup-ima-evm-utils \ | 12 | packagegroup-ima-evm-utils \ |
10 | os-release" | 13 | os-release" |
11 | 14 | ||
12 | |||
13 | LICENSE = "MIT" | ||
14 | |||
15 | inherit core-image | ||
16 | |||
17 | export IMAGE_BASENAME = "integrity-image-minimal" | 15 | export IMAGE_BASENAME = "integrity-image-minimal" |
18 | 16 | ||
19 | INHERIT += "ima-evm-rootfs" | 17 | INHERIT += "ima-evm-rootfs" |