[yocto] [meta-security][PATCH 3/5] linux-stable: drop old versions no longer in core

[Armin Kuster]

Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 recipes-kernel/linux/linux-yocto-4.10/apparmor.cfg          | 13 -------------
 recipes-kernel/linux/linux-yocto-4.10/smack-default-lsm.cfg |  2 --
 recipes-kernel/linux/linux-yocto-4.10/smack.cfg             |  8 --------
 recipes-kernel/linux/linux-yocto-4.9/apparmor.cfg           | 13 -------------
 recipes-kernel/linux/linux-yocto-4.9/smack-default-lsm.cfg  |  2 --
 recipes-kernel/linux/linux-yocto-4.9/smack.cfg              |  8 --------
 recipes-kernel/linux/linux-yocto-4.9/tpm.cfg                |  9 ---------
 recipes-kernel/linux/linux-yocto-4.9/tpm.scc                |  4 ----
 recipes-kernel/linux/linux-yocto_4.10.bbappend              | 10 ----------
 recipes-kernel/linux/linux-yocto_4.9.bbappend               | 13 -------------
 10 files changed, 82 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-yocto-4.10/apparmor.cfg
 delete mode 100644 recipes-kernel/linux/linux-yocto-4.10/smack-default-lsm.cfg
 delete mode 100644 recipes-kernel/linux/linux-yocto-4.10/smack.cfg
 delete mode 100644 recipes-kernel/linux/linux-yocto-4.9/apparmor.cfg
 delete mode 100644 recipes-kernel/linux/linux-yocto-4.9/smack-default-lsm.cfg
 delete mode 100644 recipes-kernel/linux/linux-yocto-4.9/smack.cfg
 delete mode 100644 recipes-kernel/linux/linux-yocto-4.9/tpm.cfg
 delete mode 100644 recipes-kernel/linux/linux-yocto-4.9/tpm.scc
 delete mode 100644 recipes-kernel/linux/linux-yocto_4.10.bbappend
 delete mode 100644 recipes-kernel/linux/linux-yocto_4.9.bbappend

diff --git a/recipes-kernel/linux/linux-yocto-4.10/apparmor.cfg b/recipes-kernel/linux/linux-yocto-4.10/apparmor.cfg
deleted file mode 100644
index 1dc4168..0000000
--- a/recipes-kernel/linux/linux-yocto-4.10/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.10/smack-default-lsm.cfg b/recipes-kernel/linux/linux-yocto-4.10/smack-default-lsm.cfg
deleted file mode 100644
index b5c4845..0000000
--- a/recipes-kernel/linux/linux-yocto-4.10/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.10/smack.cfg b/recipes-kernel/linux/linux-yocto-4.10/smack.cfg
deleted file mode 100644
index 62f465a..0000000
--- a/recipes-kernel/linux/linux-yocto-4.10/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-4.9/apparmor.cfg b/recipes-kernel/linux/linux-yocto-4.9/apparmor.cfg
deleted file mode 100644
index 1dc4168..0000000
--- a/recipes-kernel/linux/linux-yocto-4.9/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.9/smack-default-lsm.cfg b/recipes-kernel/linux/linux-yocto-4.9/smack-default-lsm.cfg
deleted file mode 100644
index b5c4845..0000000
--- a/recipes-kernel/linux/linux-yocto-4.9/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.9/smack.cfg b/recipes-kernel/linux/linux-yocto-4.9/smack.cfg
deleted file mode 100644
index 62f465a..0000000
--- a/recipes-kernel/linux/linux-yocto-4.9/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-4.9/tpm.cfg b/recipes-kernel/linux/linux-yocto-4.9/tpm.cfg
deleted file mode 100644
index fe1bb3f..0000000
--- a/recipes-kernel/linux/linux-yocto-4.9/tpm.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-CONFIG_HW_RANDOM_TPM=y
-CONFIG_TCG_TPM=y
-CONFIG_TCG_TIS_CORE=y
-CONFIG_TCG_TIS=y
-CONFIG_TCG_CRB=y
-CONFIG_TCG_VTPM_PROXY=y
-CONFIG_DEVPORT=y
-CONFIG_FUSE_FS=y
-CONFIG_CUSE=y
diff --git a/recipes-kernel/linux/linux-yocto-4.9/tpm.scc b/recipes-kernel/linux/linux-yocto-4.9/tpm.scc
deleted file mode 100644
index 7c7ec2d..0000000
--- a/recipes-kernel/linux/linux-yocto-4.9/tpm.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "TPM Kernel Support"
-define KFEATURE_COMPATIBILITY arch
-
-kconf non-hardware tpm.cfg
diff --git a/recipes-kernel/linux/linux-yocto_4.10.bbappend b/recipes-kernel/linux/linux-yocto_4.10.bbappend
deleted file mode 100644
index 0e610d4..0000000
--- a/recipes-kernel/linux/linux-yocto_4.10.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.10:"
-
-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.9.bbappend b/recipes-kernel/linux/linux-yocto_4.9.bbappend
deleted file mode 100644
index adda041..0000000
--- a/recipes-kernel/linux/linux-yocto_4.9.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-4.9:"
-
-# TPM kernel support
-KERNEL_FEATURES_append += "${@bb.utils.contains('DISTRO_FEATURES', 'tpm', ' features/tpm/tpm.scc', '', d)}"
-
-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)} \
-"
-- 
2.7.4