diff options
| author | niko.mauno@vaisala.com <niko.mauno@vaisala.com> | 2020-09-10 16:17:52 +0000 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2020-10-16 07:16:05 -0700 |
| commit | c8d3edb3c48e228edf80815ddb1aa92e6010eb6b (patch) | |
| tree | 4259da5a465562a983bad87baeedc82025ecfbd3 | |
| parent | 9e8522aeb5aaa5a2f57d4c291ab8e301be440fc4 (diff) | |
| download | meta-security-c8d3edb3c48e228edf80815ddb1aa92e6010eb6b.tar.gz | |
linux-yocto(-dev): Add dm-verity fragment as needed
Add checks that include dm-verity specific kernel config fragment
when dm-verity-img.bbclass is used.
Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
(cherry picked from commit 6f40921308be358ffce1a4e51a76672ad4168c21)
| -rw-r--r-- | recipes-kernel/linux/linux-yocto-dev.bbappend | 1 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-yocto_5.%.bbappend | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend index 39d4e6f..fa536d0 100644 --- a/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}" | 1 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}" |
| 2 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}" | 2 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}" |
| 3 | KERNEL_FEATURES_append = " ${@bb.utils.contains("IMAGE_CLASSES", "dm-verity-img", " features/device-mapper/dm-verity.scc", "" ,d)}" | ||
diff --git a/recipes-kernel/linux/linux-yocto_5.%.bbappend b/recipes-kernel/linux/linux-yocto_5.%.bbappend index 39d4e6f..fa536d0 100644 --- a/recipes-kernel/linux/linux-yocto_5.%.bbappend +++ b/recipes-kernel/linux/linux-yocto_5.%.bbappend | |||
| @@ -1,2 +1,3 @@ | |||
| 1 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}" | 1 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}" |
| 2 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}" | 2 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}" |
| 3 | KERNEL_FEATURES_append = " ${@bb.utils.contains("IMAGE_CLASSES", "dm-verity-img", " features/device-mapper/dm-verity.scc", "" ,d)}" | ||