Signed-off-by: Armin Kuster <[email protected]>
---
.../recipes-core/initrdscripts/initramfs-framework-ima.bb | 3 +++
.../recipes-core/packagegroups/packagegroup-ima-evm-utils.bb | 2 +-
meta-integrity/recipes-kernel/linux/linux-%.bbappend | 4 ++--
.../recipes-security/ima-evm-utils/ima-evm-utils_git.bb | 4 +++-
.../ima_policy_appraise_all/ima-policy-appraise-all_1.0.bb | 3 +++
.../ima_policy_hashed/ima-policy-hashed_1.0.bb | 3 +++
.../ima_policy_simple/ima-policy-simple_1.0.bb | 3 +++
7 files changed, 18 insertions(+), 4 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"
SRC_URI = " file://ima"
+inherit features_check
+REQUIRED_DISTRO_FEATURES = "ima"
+
do_install () {
install -d ${D}/${sysconfdir}/ima
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..bc3ebd5 100644
--- a/meta-integrity/recipes-core/packagegroups/packagegroup-ima-evm-utils.bb
+++ b/meta-integrity/recipes-core/packagegroups/packagegroup-ima-evm-utils.bb
@@ -4,6 +4,6 @@ LICENSE = "MIT"
inherit packagegroup
# Only one at the moment, but perhaps more will come in the future.
-RDEPENDS_${PN} = " \
+RDEPENDS_${PN}_ima = " \
ima-evm-utils \
"
diff --git a/meta-integrity/recipes-kernel/linux/linux-%.bbappend
b/meta-integrity/recipes-kernel/linux/linux-%.bbappend
index f9a48cd..443289b 100644
--- a/meta-integrity/recipes-kernel/linux/linux-%.bbappend
+++ b/meta-integrity/recipes-kernel/linux/linux-%.bbappend
@@ -1,5 +1,5 @@
-KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ima", "
features/ima/ima.scc", "" ,d)}"
+KERNEL_FEATURES_append_ima = " ${@bb.utils.contains("DISTRO_FEATURES", "ima",
" features/ima/ima.scc", "" ,d)}"
-KERNEL_FEATURES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'modsign',
' features/ima/modsign.scc', '', d)}"
+KERNEL_FEATURES_append_modsign = " ${@bb.utils.contains('DISTRO_FEATURES',
'modsign', ' features/ima/modsign.scc', '', d)}"
inherit ${@bb.utils.contains('DISTRO_FEATURES', 'modsign', 'kernel-modsign',
'', d)}
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"
S = "${WORKDIR}/git"
-inherit pkgconfig autotools
+inherit pkgconfig autotools features_check
+
+REQUIRED_DISTRO_FEATURES = "ima"
EXTRA_OECONF_append_class-target = "
--with-kernel-headers=${STAGING_KERNEL_BUILDDIR}"
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"
SRC_URI = " file://${IMA_POLICY}"
+inherit features_check
+REQUIRED_DISTRO_FEATURES = "ima"
+
do_install () {
install -d ${D}/${sysconfdir}/ima
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 = " \
file://${IMA_POLICY} \
"
+inherit features_check
+REQUIRED_DISTRO_FEATURES = "ima"
+
do_install () {
install -d ${D}/${sysconfdir}/ima
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"
SRC_URI = " file://${IMA_POLICY}"
+inherit features_check
+REQUIRED_DISTRO_FEATURES = "ima"
+
do_install () {
install -d ${D}/${sysconfdir}/ima
install ${WORKDIR}/${IMA_POLICY} ${D}/${sysconfdir}/ima/ima-policy
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#47797): https://lists.yoctoproject.org/g/yocto/message/47797
Mute This Topic: https://lists.yoctoproject.org/mt/69215458/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
