linux-bbappends: simplify

Signed-off-by: Armin Kuster <akuster808@gmail.com>

6 files changed, 3 insertions, 4 deletions

diff --git a/recipes-kernel/linux/linux-yocto_5.0.%.bbappend b/recipes-kernel/linux/linux-%.bbapend
index f810e21..ec7adeb 100644
--- a/recipes-kernel/linux/linux-yocto_5.0.%.bbappend
+++ b/recipes-kernel/linux/linux-%.bbapend
@@ -1,11 +1,9 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.0:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/linux:"
 
 SRC_URI += "\
         ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor.cfg', '', d)} \
         ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor_on_boot.cfg', '', d)} \
-"
-
-SRC_URI += "\
         ${@bb.utils.contains('DISTRO_FEATURES', 'smack', ' file://smack.cfg', '', d)} \
         ${@bb.utils.contains('DISTRO_FEATURES', 'smack', ' file://smack-default-lsm.cfg', '', d)} \
+        ${@bb.utils.contains('DISTRO_FEATURES', 'yama', ' file://yama.cfg', '', d)} \
 "
diff --git a/recipes-kernel/linux/linux-yocto/yama.cfg b/recipes-kernel/linux/linux-yocto/yama.cfg
new file mode 100644
index 0000000..3b55731
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto/yama.cfg
@@ -0,0 +1 @@
+CONFIG_SECURITY_YAMA=y
diff --git a/recipes-kernel/linux/linux-yocto-5.0/apparmor.cfg b/recipes-kernel/linux/linux/apparmor.cfg
index ae6cdcd..ae6cdcd 100644
--- a/recipes-kernel/linux/linux-yocto-5.0/apparmor.cfg
+++ b/recipes-kernel/linux/linux/apparmor.cfg
diff --git a/recipes-kernel/linux/linux-yocto-5.0/apparmor_on_boot.cfg b/recipes-kernel/linux/linux/apparmor_on_boot.cfg
index fc35740..fc35740 100644
--- a/recipes-kernel/linux/linux-yocto-5.0/apparmor_on_boot.cfg
+++ b/recipes-kernel/linux/linux/apparmor_on_boot.cfg
diff --git a/recipes-kernel/linux/linux-yocto-5.0/smack-default-lsm.cfg b/recipes-kernel/linux/linux/smack-default-lsm.cfg
index b5c4845..b5c4845 100644
--- a/recipes-kernel/linux/linux-yocto-5.0/smack-default-lsm.cfg
+++ b/recipes-kernel/linux/linux/smack-default-lsm.cfg
diff --git a/recipes-kernel/linux/linux-yocto-5.0/smack.cfg b/recipes-kernel/linux/linux/smack.cfg
index 0d5fc64..0d5fc64 100644
--- a/recipes-kernel/linux/linux-yocto-5.0/smack.cfg
+++ b/recipes-kernel/linux/linux/smack.cfg