diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
| commit | bb6a14e2f317abf60677c6ad8de9c33d5760bf36 (patch) | |
| tree | 00457d3677e86437cec25fd7dab6c4513a53b1a4 /meta-security/recipes-kernel/linux | |
| parent | defdca82c107f46e980c84bffb1b2c1263522fa0 (diff) | |
| parent | cf6fd27dbd8e2d1b507f8c3752b85801b2c6ef57 (diff) | |
| download | openbmc-bb6a14e2f317abf60677c6ad8de9c33d5760bf36.tar.xz | |
Merge tag '0.63' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-security/recipes-kernel/linux')
| -rw-r--r-- | meta-security/recipes-kernel/linux/linux-%_5.%.bbappend | 4 | ||||
| -rw-r--r-- | meta-security/recipes-kernel/linux/linux-yocto_5.%.bbappend | 4 | ||||
| -rw-r--r-- | meta-security/recipes-kernel/linux/linux-yocto_security.inc (renamed from meta-security/recipes-kernel/linux/linux-yocto-dev.bbappend) | 0 |
3 files changed, 1 insertions, 7 deletions
diff --git a/meta-security/recipes-kernel/linux/linux-%_5.%.bbappend b/meta-security/recipes-kernel/linux/linux-%_5.%.bbappend deleted file mode 100644 index 6bc40cd96..000000000 --- a/meta-security/recipes-kernel/linux/linux-%_5.%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}" -KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}" -KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "yama", " features/yama/yama.scc", "" ,d)}" -KERNEL_FEATURES_append = " ${@bb.utils.contains("IMAGE_CLASSES", "dm-verity-img", " features/device-mapper/dm-verity.scc", "" ,d)}" diff --git a/meta-security/recipes-kernel/linux/linux-yocto_5.%.bbappend b/meta-security/recipes-kernel/linux/linux-yocto_5.%.bbappend index fa536d095..1d9054faa 100644 --- a/meta-security/recipes-kernel/linux/linux-yocto_5.%.bbappend +++ b/meta-security/recipes-kernel/linux/linux-yocto_5.%.bbappend @@ -1,3 +1 @@ -KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "apparmor", " features/apparmor/apparmor.scc", "" ,d)}" -KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "smack", " features/smack/smack.scc", "" ,d)}" -KERNEL_FEATURES_append = " ${@bb.utils.contains("IMAGE_CLASSES", "dm-verity-img", " features/device-mapper/dm-verity.scc", "" ,d)}" +require ${@bb.utils.contains('DISTRO_FEATURES', 'security', '${BPN}_security.inc', '', d)} diff --git a/meta-security/recipes-kernel/linux/linux-yocto-dev.bbappend b/meta-security/recipes-kernel/linux/linux-yocto_security.inc index fa536d095..fa536d095 100644 --- a/meta-security/recipes-kernel/linux/linux-yocto-dev.bbappend +++ b/meta-security/recipes-kernel/linux/linux-yocto_security.inc |