diff options
author | Armin Kuster <akuster808@gmail.com> | 2019-12-22 15:43:00 +0000 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2020-01-04 10:55:26 -0800 |
commit | 5d629ccb542fe8ce523ea0a53d8a505552004302 (patch) | |
tree | d8827bb8c677f06b02abde7eea5526cf8fe8a1a2 | |
parent | 912ead8099db391a872d5c686f4bff8ed74c98e7 (diff) | |
download | meta-security-5d629ccb542fe8ce523ea0a53d8a505552004302.tar.gz |
meta-integrity: fix issues with yocto-check-layer
[v2]
re-did solutions
Signed-off-by: Armin Kuster <akuster808@gmail.com>
6 files changed, 18 insertions, 2 deletions
diff --git a/meta-integrity/recipes-core/initrdscripts/initramfs-framework-ima.bb b/meta-integrity/recipes-core/initrdscripts/initramfs-framework-ima.bb index 95c853a..dacdc8b 100644 --- a/meta-integrity/recipes-core/initrdscripts/initramfs-framework-ima.bb +++ b/meta-integrity/recipes-core/initrdscripts/initramfs-framework-ima.bb | |||
@@ -16,6 +16,9 @@ IMA_POLICY ?= "ima-policy-hashed" | |||
16 | 16 | ||
17 | SRC_URI = " file://ima" | 17 | SRC_URI = " file://ima" |
18 | 18 | ||
19 | inherit features_check | ||
20 | REQUIRED_DISTRO_FEATURES = "ima" | ||
21 | |||
19 | do_install () { | 22 | do_install () { |
20 | install -d ${D}/${sysconfdir}/ima | 23 | install -d ${D}/${sysconfdir}/ima |
21 | install -d ${D}/init.d | 24 | install -d ${D}/init.d |
diff --git a/meta-integrity/recipes-core/packagegroups/packagegroup-ima-evm-utils.bb b/meta-integrity/recipes-core/packagegroups/packagegroup-ima-evm-utils.bb index 18acc9d..8196edb 100644 --- a/meta-integrity/recipes-core/packagegroups/packagegroup-ima-evm-utils.bb +++ b/meta-integrity/recipes-core/packagegroups/packagegroup-ima-evm-utils.bb | |||
@@ -1,7 +1,9 @@ | |||
1 | SUMMARY = "IMA/EVM userspace tools" | 1 | SUMMARY = "IMA/EVM userspace tools" |
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | 3 | ||
4 | inherit packagegroup | 4 | inherit packagegroup features_check |
5 | |||
6 | REQUIRED_DISTRO_FEATURES = "ima" | ||
5 | 7 | ||
6 | # Only one at the moment, but perhaps more will come in the future. | 8 | # Only one at the moment, but perhaps more will come in the future. |
7 | RDEPENDS_${PN} = " \ | 9 | RDEPENDS_${PN} = " \ |
diff --git a/meta-integrity/recipes-security/ima-evm-utils/ima-evm-utils_git.bb b/meta-integrity/recipes-security/ima-evm-utils/ima-evm-utils_git.bb index 92c24c9..7f649c2 100644 --- a/meta-integrity/recipes-security/ima-evm-utils/ima-evm-utils_git.bb +++ b/meta-integrity/recipes-security/ima-evm-utils/ima-evm-utils_git.bb | |||
@@ -23,7 +23,9 @@ SRC_URI += "file://command-line-apply-operation-to-all-paths.patch" | |||
23 | 23 | ||
24 | S = "${WORKDIR}/git" | 24 | S = "${WORKDIR}/git" |
25 | 25 | ||
26 | inherit pkgconfig autotools | 26 | inherit pkgconfig autotools features_check |
27 | |||
28 | REQUIRED_DISTRO_FEATURES = "ima" | ||
27 | 29 | ||
28 | EXTRA_OECONF_append_class-target = " --with-kernel-headers=${STAGING_KERNEL_BUILDDIR}" | 30 | EXTRA_OECONF_append_class-target = " --with-kernel-headers=${STAGING_KERNEL_BUILDDIR}" |
29 | 31 | ||
diff --git a/meta-integrity/recipes-security/ima_policy_appraise_all/ima-policy-appraise-all_1.0.bb b/meta-integrity/recipes-security/ima_policy_appraise_all/ima-policy-appraise-all_1.0.bb index b58d3fe..da62a4c 100644 --- a/meta-integrity/recipes-security/ima_policy_appraise_all/ima-policy-appraise-all_1.0.bb +++ b/meta-integrity/recipes-security/ima_policy_appraise_all/ima-policy-appraise-all_1.0.bb | |||
@@ -9,6 +9,9 @@ IMA_POLICY ?= "ima_policy_appraise_all" | |||
9 | 9 | ||
10 | SRC_URI = " file://${IMA_POLICY}" | 10 | SRC_URI = " file://${IMA_POLICY}" |
11 | 11 | ||
12 | inherit features_check | ||
13 | REQUIRED_DISTRO_FEATURES = "ima" | ||
14 | |||
12 | do_install () { | 15 | do_install () { |
13 | install -d ${D}/${sysconfdir}/ima | 16 | install -d ${D}/${sysconfdir}/ima |
14 | install ${WORKDIR}/${IMA_POLICY} ${D}/${sysconfdir}/ima/ima-policy | 17 | install ${WORKDIR}/${IMA_POLICY} ${D}/${sysconfdir}/ima/ima-policy |
diff --git a/meta-integrity/recipes-security/ima_policy_hashed/ima-policy-hashed_1.0.bb b/meta-integrity/recipes-security/ima_policy_hashed/ima-policy-hashed_1.0.bb index 3352daa..ebb0426 100644 --- a/meta-integrity/recipes-security/ima_policy_hashed/ima-policy-hashed_1.0.bb +++ b/meta-integrity/recipes-security/ima_policy_hashed/ima-policy-hashed_1.0.bb | |||
@@ -11,6 +11,9 @@ SRC_URI = " \ | |||
11 | file://${IMA_POLICY} \ | 11 | file://${IMA_POLICY} \ |
12 | " | 12 | " |
13 | 13 | ||
14 | inherit features_check | ||
15 | REQUIRED_DISTRO_FEATURES = "ima" | ||
16 | |||
14 | do_install () { | 17 | do_install () { |
15 | install -d ${D}/${sysconfdir}/ima | 18 | install -d ${D}/${sysconfdir}/ima |
16 | install ${WORKDIR}/${IMA_POLICY} ${D}/${sysconfdir}/ima/ima-policy | 19 | install ${WORKDIR}/${IMA_POLICY} ${D}/${sysconfdir}/ima/ima-policy |
diff --git a/meta-integrity/recipes-security/ima_policy_simple/ima-policy-simple_1.0.bb b/meta-integrity/recipes-security/ima_policy_simple/ima-policy-simple_1.0.bb index 17132aa..cb4b6b8 100644 --- a/meta-integrity/recipes-security/ima_policy_simple/ima-policy-simple_1.0.bb +++ b/meta-integrity/recipes-security/ima_policy_simple/ima-policy-simple_1.0.bb | |||
@@ -9,6 +9,9 @@ IMA_POLICY ?= "ima_policy_simple" | |||
9 | 9 | ||
10 | SRC_URI = " file://${IMA_POLICY}" | 10 | SRC_URI = " file://${IMA_POLICY}" |
11 | 11 | ||
12 | inherit features_check | ||
13 | REQUIRED_DISTRO_FEATURES = "ima" | ||
14 | |||
12 | do_install () { | 15 | do_install () { |
13 | install -d ${D}/${sysconfdir}/ima | 16 | install -d ${D}/${sysconfdir}/ima |
14 | install ${WORKDIR}/${IMA_POLICY} ${D}/${sysconfdir}/ima/ima-policy | 17 | install ${WORKDIR}/${IMA_POLICY} ${D}/${sysconfdir}/ima/ima-policy |