From ab8d219c43099bc8d9864a082dad402ecfb7f389 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Fri, 16 Feb 2018 21:14:46 -0800 Subject: linux-yocto: move to wildcard on bbappend Signed-off-by: Armin Kuster --- recipes-kernel/linux/linux-yocto-4.12/apparmor.cfg | 13 ------------- recipes-kernel/linux/linux-yocto-4.12/smack-default-lsm.cfg | 2 -- recipes-kernel/linux/linux-yocto-4.12/smack.cfg | 8 -------- recipes-kernel/linux/linux-yocto/apparmor.cfg | 13 +++++++++++++ recipes-kernel/linux/linux-yocto/smack-default-lsm.cfg | 2 ++ recipes-kernel/linux/linux-yocto/smack.cfg | 8 ++++++++ recipes-kernel/linux/linux-yocto_4.%.bbappend | 10 ++++++++++ recipes-kernel/linux/linux-yocto_4.12.bbappend | 10 ---------- 8 files changed, 33 insertions(+), 33 deletions(-) delete mode 100644 recipes-kernel/linux/linux-yocto-4.12/apparmor.cfg delete mode 100644 recipes-kernel/linux/linux-yocto-4.12/smack-default-lsm.cfg delete mode 100644 recipes-kernel/linux/linux-yocto-4.12/smack.cfg create mode 100644 recipes-kernel/linux/linux-yocto/apparmor.cfg create mode 100644 recipes-kernel/linux/linux-yocto/smack-default-lsm.cfg create mode 100644 recipes-kernel/linux/linux-yocto/smack.cfg create mode 100644 recipes-kernel/linux/linux-yocto_4.%.bbappend delete mode 100644 recipes-kernel/linux/linux-yocto_4.12.bbappend diff --git a/recipes-kernel/linux/linux-yocto-4.12/apparmor.cfg b/recipes-kernel/linux/linux-yocto-4.12/apparmor.cfg deleted file mode 100644 index 1dc4168..0000000 --- a/recipes-kernel/linux/linux-yocto-4.12/apparmor.cfg +++ /dev/null @@ -1,13 +0,0 @@ -CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y -# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set -CONFIG_SECURITY_PATH=y -# CONFIG_SECURITY_SELINUX is not set -CONFIG_SECURITY_APPARMOR=y -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 -CONFIG_SECURITY_APPARMOR_HASH=y -CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y -CONFIG_INTEGRITY_AUDIT=y -# CONFIG_DEFAULT_SECURITY_APPARMOR is not set diff --git a/recipes-kernel/linux/linux-yocto-4.12/smack-default-lsm.cfg b/recipes-kernel/linux/linux-yocto-4.12/smack-default-lsm.cfg deleted file mode 100644 index b5c4845..0000000 --- a/recipes-kernel/linux/linux-yocto-4.12/smack-default-lsm.cfg +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_DEFAULT_SECURITY="smack" -CONFIG_DEFAULT_SECURITY_SMACK=y diff --git a/recipes-kernel/linux/linux-yocto-4.12/smack.cfg b/recipes-kernel/linux/linux-yocto-4.12/smack.cfg deleted file mode 100644 index 62f465a..0000000 --- a/recipes-kernel/linux/linux-yocto-4.12/smack.cfg +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_IP_NF_SECURITY=m -CONFIG_IP6_NF_SECURITY=m -CONFIG_EXT2_FS_SECURITY=y -CONFIG_EXT3_FS_SECURITY=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_SECURITY=y -CONFIG_SECURITY_SMACK=y -CONFIG_TMPFS_XATTR=y diff --git a/recipes-kernel/linux/linux-yocto/apparmor.cfg b/recipes-kernel/linux/linux-yocto/apparmor.cfg new file mode 100644 index 0000000..1dc4168 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/apparmor.cfg @@ -0,0 +1,13 @@ +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y +# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +CONFIG_SECURITY_PATH=y +# CONFIG_SECURITY_SELINUX is not set +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 +CONFIG_SECURITY_APPARMOR_HASH=y +CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y +CONFIG_INTEGRITY_AUDIT=y +# CONFIG_DEFAULT_SECURITY_APPARMOR is not set diff --git a/recipes-kernel/linux/linux-yocto/smack-default-lsm.cfg b/recipes-kernel/linux/linux-yocto/smack-default-lsm.cfg new file mode 100644 index 0000000..b5c4845 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/smack-default-lsm.cfg @@ -0,0 +1,2 @@ +CONFIG_DEFAULT_SECURITY="smack" +CONFIG_DEFAULT_SECURITY_SMACK=y diff --git a/recipes-kernel/linux/linux-yocto/smack.cfg b/recipes-kernel/linux/linux-yocto/smack.cfg new file mode 100644 index 0000000..62f465a --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/smack.cfg @@ -0,0 +1,8 @@ +CONFIG_IP_NF_SECURITY=m +CONFIG_IP6_NF_SECURITY=m +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_EXT4_FS_SECURITY=y +CONFIG_SECURITY=y +CONFIG_SECURITY_SMACK=y +CONFIG_TMPFS_XATTR=y diff --git a/recipes-kernel/linux/linux-yocto_4.%.bbappend b/recipes-kernel/linux/linux-yocto_4.%.bbappend new file mode 100644 index 0000000..9d68c99 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto_4.%.bbappend @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.12:" + +SRC_URI += "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor.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)} \ +" diff --git a/recipes-kernel/linux/linux-yocto_4.12.bbappend b/recipes-kernel/linux/linux-yocto_4.12.bbappend deleted file mode 100644 index 9d68c99..0000000 --- a/recipes-kernel/linux/linux-yocto_4.12.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.12:" - -SRC_URI += "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'apparmor', ' file://apparmor.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)} \ -" -- cgit v1.2.3-54-g00ecf