From 48c7b34ec3932ac522a93e631ab9d9e805142af1 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Wed, 2 Jun 2021 01:59:51 +0000 Subject: meta-integrity/recipe-kernel: use sanity check Signed-off-by: Armin Kuster --- meta-integrity/recipes-kernel/linux/linux-%.bbappend | 6 +----- meta-integrity/recipes-kernel/linux/linux_ima.inc | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 meta-integrity/recipes-kernel/linux/linux_ima.inc diff --git a/meta-integrity/recipes-kernel/linux/linux-%.bbappend b/meta-integrity/recipes-kernel/linux/linux-%.bbappend index f9a48cd..be60bfe 100644 --- a/meta-integrity/recipes-kernel/linux/linux-%.bbappend +++ b/meta-integrity/recipes-kernel/linux/linux-%.bbappend @@ -1,5 +1 @@ -KERNEL_FEATURES_append = " ${@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)}" - -inherit ${@bb.utils.contains('DISTRO_FEATURES', 'modsign', 'kernel-modsign', '', d)} +require ${@bb.utils.contains_any('DISTRO_FEATURES', 'integrity ', 'linux_ima.inc', '', d)} diff --git a/meta-integrity/recipes-kernel/linux/linux_ima.inc b/meta-integrity/recipes-kernel/linux/linux_ima.inc new file mode 100644 index 0000000..f9a48cd --- /dev/null +++ b/meta-integrity/recipes-kernel/linux/linux_ima.inc @@ -0,0 +1,5 @@ +KERNEL_FEATURES_append = " ${@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)}" + +inherit ${@bb.utils.contains('DISTRO_FEATURES', 'modsign', 'kernel-modsign', '', d)} -- cgit v1.2.3-54-g00ecf