From 51a4c6b5179d087f647cf0c458edb8ab107826ef Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 1 Jun 2019 13:51:10 -0700 Subject: [PATCH] linux-bbappends: simplify Signed-off-by: Armin Kuster --- .../linux/{linux-yocto_5.0.%.bbappend => linux-%.bbapend} | 6 ++---- recipes-kernel/linux/linux-yocto/yama.cfg | 1 + .../linux/{linux-yocto-5.0 => linux}/apparmor.cfg | 0 .../linux/{linux-yocto-5.0 => linux}/apparmor_on_boot.cfg | 0 .../linux/{linux-yocto-5.0 => linux}/smack-default-lsm.cfg | 0 recipes-kernel/linux/{linux-yocto-5.0 => linux}/smack.cfg | 0 6 files changed, 3 insertions(+), 4 deletions(-) rename recipes-kernel/linux/{linux-yocto_5.0.%.bbappend => linux-%.bbapend} (75%) create mode 100644 recipes-kernel/linux/linux-yocto/yama.cfg rename recipes-kernel/linux/{linux-yocto-5.0 => linux}/apparmor.cfg (100%) rename recipes-kernel/linux/{linux-yocto-5.0 => linux}/apparmor_on_boot.cfg (100%) rename recipes-kernel/linux/{linux-yocto-5.0 => linux}/smack-default-lsm.cfg (100%) rename recipes-kernel/linux/{linux-yocto-5.0 => linux}/smack.cfg (100%) diff --git a/recipes-kernel/linux/linux-yocto_5.0.%.bbappend b/recipes-kernel/linux/linux-%.bbapend similarity index 75% rename from recipes-kernel/linux/linux-yocto_5.0.%.bbappend rename to 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 similarity index 100% rename from recipes-kernel/linux/linux-yocto-5.0/apparmor.cfg rename to 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 similarity index 100% rename from recipes-kernel/linux/linux-yocto-5.0/apparmor_on_boot.cfg rename to 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 similarity index 100% rename from recipes-kernel/linux/linux-yocto-5.0/smack-default-lsm.cfg rename to 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 similarity index 100% rename from recipes-kernel/linux/linux-yocto-5.0/smack.cfg rename to recipes-kernel/linux/linux/smack.cfg