linux-yocto: make bbappend version neutral
PATCH v2 1/2 linux-yocto: make bbappend version neutral
update apparmor configs
[v2]
Just update configs.
leave versions intact.
Signed-off-by Armin Kuster <[email protected]>
--- recipes-kernel/linux/linux-yocto/apparmor.cfg | 12 +++++++----- .../linux/linux-yocto/apparmor_on_boot.cfg | 1 + recipes-kernel/linux/linux-yocto_4.%.bbappend | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 recipes-kernel/linux/linux-yocto/apparmor_on_boot.cfg
recipes-kernel/linux/linux-yocto/apparmor.cfg +7 -5
@@ -1,13 +1,15 @@ CONFIG_AUDIT=y -CONFIG_AUDITSYSCALL=y -CONFIG_AUDIT_WATCH=y -CONFIG_AUDIT_TREE=y # CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM 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_SECURITY_APPARMOR_DEBUG is not set CONFIG_INTEGRITY_AUDIT=y -# CONFIG_DEFAULT_SECURITY_APPARMOR is not set +CONFIG_DEFAULT_SECURITY_APPARMOR=y +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY="apparmor" +CONFIG_AUDIT_GENERIC=y
recipes-kernel/linux/linux-yocto/apparmor_on_boot.cfg new file +1 -0
@@ -0,0 +1 @@ +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
recipes-kernel/linux/linux-yocto_4.%.bbappend +1 -0
@@ -2,6 +2,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 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 += "\
Signature · 1 line
2.17.1
PATCH v2 2/2 linux-yocto/5.0: add apparmor fragments
Signed-off-by Armin Kuster <[email protected]>
--- recipes-kernel/linux/linux-yocto-5.0/apparmor.cfg | 15 +++++++++++++++ .../linux/linux-yocto-5.0/apparmor_on_boot.cfg | 1 + .../linux/linux-yocto-5.0/smack-default-lsm.cfg | 2 ++ recipes-kernel/linux/linux-yocto-5.0/smack.cfg | 8 ++++++++ recipes-kernel/linux/linux-yocto_5.0.%.bbappend | 11 +++++++++++ 5 files changed, 37 insertions(+) create mode 100644 recipes-kernel/linux/linux-yocto-5.0/apparmor.cfg create mode 100644 recipes-kernel/linux/linux-yocto-5.0/apparmor_on_boot.cfg create mode 100644 recipes-kernel/linux/linux-yocto-5.0/smack-default-lsm.cfg create mode 100644 recipes-kernel/linux/linux-yocto-5.0/smack.cfg create mode 100644 recipes-kernel/linux/linux-yocto_5.0.%.bbappend
recipes-kernel/linux/linux-yocto-5.0/apparmor.cfg new file +15 -0
@@ -0,0 +1,15 @@ +CONFIG_AUDIT=y +# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +CONFIG_SECURITY_NETWORK=y +# CONFIG_SECURITY_NETWORK_XFRM is not set +CONFIG_SECURITY_PATH=y +# CONFIG_SECURITY_SELINUX is not set +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_HASH=y +CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y +# CONFIG_SECURITY_APPARMOR_DEBUG is not set +CONFIG_INTEGRITY_AUDIT=y +CONFIG_DEFAULT_SECURITY_APPARMOR=y +# CONFIG_DEFAULT_SECURITY_DAC is not set +CONFIG_DEFAULT_SECURITY="apparmor" +CONFIG_AUDIT_GENERIC=y
recipes-kernel/linux/linux-yocto-5.0/apparmor_on_boot.cfg new file +1 -0
@@ -0,0 +1 @@ +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1
recipes-kernel/linux/linux-yocto-5.0/smack-default-lsm.cfg new file +2 -0
@@ -0,0 +1,2 @@ +CONFIG_DEFAULT_SECURITY="smack" +CONFIG_DEFAULT_SECURITY_SMACK=y
recipes-kernel/linux/linux-yocto-5.0/smack.cfg new file +8 -0
@@ -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
recipes-kernel/linux/linux-yocto_5.0.%.bbappend new file +11 -0
@@ -0,0 +1,11 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-5.0:" + +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)} \ +"
Signature · 1 line
2.17.1