[linux-yocto] [PATCH 1/2][v2] cgl: Add cgl features

Bruce Ashfield bruce.ashfield at windriver.com
Mon Sep 25 07:31:28 PDT 2017


On 09/25/2017 07:43 AM, zhe.he at windriver.com wrote:
> From: He Zhe <zhe.he at windriver.com>
> 
> Add features for Carrier Grade Linux
> https://wiki.linuxfoundation.org/cgl/start

This says patch 1/2, but I don't think there's actually a patch
two. If that is wrong, resend patch 2, since I don't have it.

I've merged this to the 4.12 and master branches of the kernel-cache

Bruce

> 
> Signed-off-by: He Zhe <zhe.he at windriver.com>
> ---
>   cgl/cfg/dmm.cfg                      |  1 +
>   cgl/cfg/dmm.scc                      |  4 ++++
>   cgl/cfg/drbd.cfg                     |  1 +
>   cgl/cfg/drbd.scc                     |  4 ++++
>   cgl/cfg/fs/ocfs2.cfg                 | 15 +++++++++++++++
>   cgl/cfg/fs/ocfs2.scc                 |  4 ++++
>   cgl/cfg/iscsi.cfg                    | 14 ++++++++++++++
>   cgl/cfg/iscsi.scc                    |  6 ++++++
>   cgl/cfg/net/ip_vs.cfg                | 36 ++++++++++++++++++++++++++++++++++++
>   cgl/cfg/net/ip_vs.scc                |  4 ++++
>   cgl/cfg/net/l2tp.cfg                 | 15 +++++++++++++++
>   cgl/cfg/net/l2tp.scc                 |  4 ++++
>   cgl/cfg/net/macvlan.cfg              | 14 ++++++++++++++
>   cgl/cfg/net/macvlan.scc              |  4 ++++
>   cgl/features/aoe/aoe.cfg             |  1 +
>   cgl/features/aoe/aoe.scc             |  4 ++++
>   cgl/features/audit/audit.cfg         |  6 ++++++
>   cgl/features/audit/audit.scc         |  4 ++++
>   cgl/features/mip6/mip6.cfg           |  8 ++++++++
>   cgl/features/mip6/mip6.scc           |  5 +++++
>   cgl/features/pstore/pstore.cfg       |  3 +++
>   cgl/features/pstore/pstore.scc       |  4 ++++
>   cgl/features/qdisc/qdisc_stats.cfg   |  1 +
>   cgl/features/qdisc/qdisc_stats.scc   |  1 +
>   cgl/features/quota/quota.cfg         |  5 +++++
>   cgl/features/quota/quota.scc         |  4 ++++
>   cgl/features/selinux/selinux-dev.cfg |  3 +++
>   cgl/features/selinux/selinux-dev.scc |  3 +++
>   cgl/features/selinux/selinux.cfg     | 11 +++++++++++
>   cgl/features/selinux/selinux.scc     |  4 ++++
>   cgl/features/udp/udp_stats.cfg       |  1 +
>   cgl/features/udp/udp_stats.scc       |  1 +
>   32 files changed, 195 insertions(+)
>   create mode 100644 cgl/cfg/dmm.cfg
>   create mode 100644 cgl/cfg/dmm.scc
>   create mode 100644 cgl/cfg/drbd.cfg
>   create mode 100644 cgl/cfg/drbd.scc
>   create mode 100644 cgl/cfg/fs/ocfs2.cfg
>   create mode 100644 cgl/cfg/fs/ocfs2.scc
>   create mode 100644 cgl/cfg/iscsi.cfg
>   create mode 100644 cgl/cfg/iscsi.scc
>   create mode 100644 cgl/cfg/net/ip_vs.cfg
>   create mode 100644 cgl/cfg/net/ip_vs.scc
>   create mode 100644 cgl/cfg/net/l2tp.cfg
>   create mode 100644 cgl/cfg/net/l2tp.scc
>   create mode 100644 cgl/cfg/net/macvlan.cfg
>   create mode 100644 cgl/cfg/net/macvlan.scc
>   create mode 100644 cgl/features/aoe/aoe.cfg
>   create mode 100644 cgl/features/aoe/aoe.scc
>   create mode 100644 cgl/features/audit/audit.cfg
>   create mode 100644 cgl/features/audit/audit.scc
>   create mode 100644 cgl/features/mip6/mip6.cfg
>   create mode 100644 cgl/features/mip6/mip6.scc
>   create mode 100644 cgl/features/pstore/pstore.cfg
>   create mode 100644 cgl/features/pstore/pstore.scc
>   create mode 100644 cgl/features/qdisc/qdisc_stats.cfg
>   create mode 100644 cgl/features/qdisc/qdisc_stats.scc
>   create mode 100644 cgl/features/quota/quota.cfg
>   create mode 100644 cgl/features/quota/quota.scc
>   create mode 100644 cgl/features/selinux/selinux-dev.cfg
>   create mode 100644 cgl/features/selinux/selinux-dev.scc
>   create mode 100644 cgl/features/selinux/selinux.cfg
>   create mode 100644 cgl/features/selinux/selinux.scc
>   create mode 100644 cgl/features/udp/udp_stats.cfg
>   create mode 100644 cgl/features/udp/udp_stats.scc
> 
> diff --git a/cgl/cfg/dmm.cfg b/cgl/cfg/dmm.cfg
> new file mode 100644
> index 0000000..e8645a2
> --- /dev/null
> +++ b/cgl/cfg/dmm.cfg
> @@ -0,0 +1 @@
> +CONFIG_DM_MULTIPATH=y
> diff --git a/cgl/cfg/dmm.scc b/cgl/cfg/dmm.scc
> new file mode 100644
> index 0000000..49fc19a
> --- /dev/null
> +++ b/cgl/cfg/dmm.scc
> @@ -0,0 +1,4 @@
> +define KFEATURE_DESCRIPTION "Device Mapper Multipath Support"
> +define KFEATURE_COMPATIBILITY all
> +
> +kconf non-hardware dmm.cfg
> diff --git a/cgl/cfg/drbd.cfg b/cgl/cfg/drbd.cfg
> new file mode 100644
> index 0000000..475b821
> --- /dev/null
> +++ b/cgl/cfg/drbd.cfg
> @@ -0,0 +1 @@
> +CONFIG_BLK_DEV_DRBD=y
> diff --git a/cgl/cfg/drbd.scc b/cgl/cfg/drbd.scc
> new file mode 100644
> index 0000000..a6de3b8
> --- /dev/null
> +++ b/cgl/cfg/drbd.scc
> @@ -0,0 +1,4 @@
> +define KFEATURE_DESCRIPTION "DRBD Block Device Support"
> +define KFEATURE_COMPATIBILITY all
> +
> +kconf non-hardware drbd.cfg
> diff --git a/cgl/cfg/fs/ocfs2.cfg b/cgl/cfg/fs/ocfs2.cfg
> new file mode 100644
> index 0000000..8d7caf3
> --- /dev/null
> +++ b/cgl/cfg/fs/ocfs2.cfg
> @@ -0,0 +1,15 @@
> +#.........................................................................
> +#                                WARNING
> +#
> +# This file is a kernel configuration fragment, and not a full kernel
> +# configuration file.  The final kernel configuration is made up of
> +# an assembly of processed fragments, each of which is designed to
> +# capture a specific part of the final configuration (e.g. platform
> +# configuration, feature configuration, and board specific hardware
> +# configuration).  For more information on kernel configuration, please
> +# consult the product documentation.
> +#
> +#.........................................................................
> +
> +CONFIG_OCFS2_FS=m
> +CONFIG_OCFS2_FS_O2CB=m
> diff --git a/cgl/cfg/fs/ocfs2.scc b/cgl/cfg/fs/ocfs2.scc
> new file mode 100644
> index 0000000..4516d66
> --- /dev/null
> +++ b/cgl/cfg/fs/ocfs2.scc
> @@ -0,0 +1,4 @@
> +define KFEATURE_DESCRIPTION "OCFS2 file system support"
> +define KFEATURE_COMPATIBILITY all
> +
> +kconf non-hardware ocfs2.cfg
> diff --git a/cgl/cfg/iscsi.cfg b/cgl/cfg/iscsi.cfg
> new file mode 100644
> index 0000000..2174382
> --- /dev/null
> +++ b/cgl/cfg/iscsi.cfg
> @@ -0,0 +1,14 @@
> +#.........................................................................
> +#                                WARNING
> +#
> +# This file is a kernel configuration fragment, and not a full kernel
> +# configuration file.  The final kernel configuration is made up of
> +# an assembly of processed fragments, each of which is designed to
> +# capture a specific part of the final configuration (e.g. platform
> +# configuration, feature configuration, and board specific hardware
> +# configuration).  For more information on kernel configuration, please
> +# consult the product documentation.
> +#
> +#.........................................................................
> +
> +CONFIG_ISCSI_TCP=m
> diff --git a/cgl/cfg/iscsi.scc b/cgl/cfg/iscsi.scc
> new file mode 100644
> index 0000000..b6f84cf
> --- /dev/null
> +++ b/cgl/cfg/iscsi.scc
> @@ -0,0 +1,6 @@
> +define KFEATURE_DESCRIPTION "iSCSI Initiator over TCP/IP"
> +define KFEATURE_COMPATIBILITY all
> +
> +include features/scsi/scsi.scc
> +
> +kconf non-hardware iscsi.cfg
> diff --git a/cgl/cfg/net/ip_vs.cfg b/cgl/cfg/net/ip_vs.cfg
> new file mode 100644
> index 0000000..487ee2f
> --- /dev/null
> +++ b/cgl/cfg/net/ip_vs.cfg
> @@ -0,0 +1,36 @@
> +CONFIG_IP_VS=m
> +CONFIG_IP_VS_IPV6=y
> +CONFIG_IP_VS_TAB_BITS=12
> +
> +#
> +# IPVS transport protocol load balancing support
> +#
> +CONFIG_IP_VS_PROTO_TCP=y
> +CONFIG_IP_VS_PROTO_UDP=y
> +CONFIG_IP_VS_PROTO_AH_ESP=y
> +CONFIG_IP_VS_PROTO_ESP=y
> +CONFIG_IP_VS_PROTO_AH=y
> +CONFIG_IP_VS_PROTO_SCTP=y
> +
> +#
> +# IPVS scheduler
> +#
> +CONFIG_IP_VS_RR=m
> +CONFIG_IP_VS_WRR=m
> +CONFIG_IP_VS_LC=m
> +CONFIG_IP_VS_WLC=m
> +CONFIG_IP_VS_LBLC=m
> +CONFIG_IP_VS_LBLCR=m
> +CONFIG_IP_VS_DH=m
> +CONFIG_IP_VS_SH=m
> +CONFIG_IP_VS_SED=m
> +CONFIG_IP_VS_NQ=m
> +
> +#
> +# IPVS SH scheduler
> +#
> +CONFIG_IP_VS_SH_TAB_BITS=8
> +
> +#
> +# IPVS application helper
> +#
> diff --git a/cgl/cfg/net/ip_vs.scc b/cgl/cfg/net/ip_vs.scc
> new file mode 100644
> index 0000000..25d1b04
> --- /dev/null
> +++ b/cgl/cfg/net/ip_vs.scc
> @@ -0,0 +1,4 @@
> +define KFEATURE_DESCRIPTION "Enable IP virtual server"
> +define KFEATURE_COMPATIBILITY all
> +
> +kconf non-hardware ip_vs.cfg
> diff --git a/cgl/cfg/net/l2tp.cfg b/cgl/cfg/net/l2tp.cfg
> new file mode 100644
> index 0000000..8dd1474
> --- /dev/null
> +++ b/cgl/cfg/net/l2tp.cfg
> @@ -0,0 +1,15 @@
> +#.........................................................................
> +#                                WARNING
> +#
> +# This file is a kernel configuration fragment, and not a full kernel
> +# configuration file.  The final kernel configuration is made up of
> +# an assembly of processed fragments, each of which is designed to
> +# capture a specific part of the final configuration (e.g. platform
> +# configuration, feature configuration, and board specific hardware
> +# configuration).  For more information on kernel configuration, please
> +# consult the product documentation.
> +#
> +#.........................................................................
> +
> +CONFIG_L2TP=y
> +CONFIG_PPPOL2TP=y
> diff --git a/cgl/cfg/net/l2tp.scc b/cgl/cfg/net/l2tp.scc
> new file mode 100644
> index 0000000..7052c31
> --- /dev/null
> +++ b/cgl/cfg/net/l2tp.scc
> @@ -0,0 +1,4 @@
> +define KFEATURE_DESCRIPTION "Layer 2 Tunneling Protocol Support"
> +define KFEATURE_COMPATIBILITY all
> +
> +kconf non-hardware l2tp.cfg
> diff --git a/cgl/cfg/net/macvlan.cfg b/cgl/cfg/net/macvlan.cfg
> new file mode 100644
> index 0000000..9ad6a64
> --- /dev/null
> +++ b/cgl/cfg/net/macvlan.cfg
> @@ -0,0 +1,14 @@
> +#.........................................................................
> +#                                WARNING
> +#
> +# This file is a kernel configuration fragment, and not a full kernel
> +# configuration file.  The final kernel configuration is made up of
> +# an assembly of processed fragments, each of which is designed to
> +# capture a specific part of the final configuration (e.g. platform
> +# configuration, feature configuration, and board specific hardware
> +# configuration).  For more information on kernel configuration, please
> +# consult the product documentation.
> +#
> +#.........................................................................
> +
> +CONFIG_MACVLAN=m
> diff --git a/cgl/cfg/net/macvlan.scc b/cgl/cfg/net/macvlan.scc
> new file mode 100644
> index 0000000..6c227f3
> --- /dev/null
> +++ b/cgl/cfg/net/macvlan.scc
> @@ -0,0 +1,4 @@
> +define KFEATURE_DESCRIPTION "MAC-VLAN support"
> +define KFEATURE_COMPATIBILITY all
> +
> +kconf non-hardware macvlan.cfg
> diff --git a/cgl/features/aoe/aoe.cfg b/cgl/features/aoe/aoe.cfg
> new file mode 100644
> index 0000000..f9a30b5
> --- /dev/null
> +++ b/cgl/features/aoe/aoe.cfg
> @@ -0,0 +1 @@
> +CONFIG_ATA_OVER_ETH=m
> diff --git a/cgl/features/aoe/aoe.scc b/cgl/features/aoe/aoe.scc
> new file mode 100644
> index 0000000..7683712
> --- /dev/null
> +++ b/cgl/features/aoe/aoe.scc
> @@ -0,0 +1,4 @@
> +define KFEATURE_DESCRIPTION "Enable ATA Over Ethernet (AOE)"
> +define KFEATURE_COMPATIBILITY arch
> +
> +kconf non-hardware aoe.cfg
> diff --git a/cgl/features/audit/audit.cfg b/cgl/features/audit/audit.cfg
> new file mode 100644
> index 0000000..3397cc5
> --- /dev/null
> +++ b/cgl/features/audit/audit.cfg
> @@ -0,0 +1,6 @@
> +CONFIG_AUDIT=y
> +CONFIG_AUDITSYSCALL=y
> +CONFIG_AUDIT_WATCH=y
> +CONFIG_AUDIT_TREE=y
> +# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set
> +CONFIG_AUDIT_GENERIC=y
> diff --git a/cgl/features/audit/audit.scc b/cgl/features/audit/audit.scc
> new file mode 100644
> index 0000000..cb09048
> --- /dev/null
> +++ b/cgl/features/audit/audit.scc
> @@ -0,0 +1,4 @@
> +define KFEATURE_DESCRIPTION "Enable auditing infrastructure"
> +define KFEATURE_COMPATIBILITY all
> +
> +kconf non-hardware audit.cfg
> diff --git a/cgl/features/mip6/mip6.cfg b/cgl/features/mip6/mip6.cfg
> new file mode 100644
> index 0000000..8987803
> --- /dev/null
> +++ b/cgl/features/mip6/mip6.cfg
> @@ -0,0 +1,8 @@
> +CONFIG_SYSVIPC=y
> +CONFIG_XFRM_MIGRATE=y
> +CONFIG_NET_KEY=m
> +CONFIG_NET_KEY_MIGRATE=y
> +CONFIG_IPV6_MIP6=m
> +CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
> +CONFIG_IPV6_MULTIPLE_TABLES=y
> +CONFIG_IPV6_SUBTREES=y
> diff --git a/cgl/features/mip6/mip6.scc b/cgl/features/mip6/mip6.scc
> new file mode 100644
> index 0000000..c10fe13
> --- /dev/null
> +++ b/cgl/features/mip6/mip6.scc
> @@ -0,0 +1,5 @@
> +define KFEATURE_DESCRIPTION "IPv6 Mobility in RFC 3775 Support"
> +define KFEATURE_COMPATIBILITY all
> +
> +include cfg/net/ipv6.scc
> +kconf non-hardware mip6.cfg
> diff --git a/cgl/features/pstore/pstore.cfg b/cgl/features/pstore/pstore.cfg
> new file mode 100644
> index 0000000..c2ca3a0
> --- /dev/null
> +++ b/cgl/features/pstore/pstore.cfg
> @@ -0,0 +1,3 @@
> +CONFIG_PSTORE=y
> +CONFIG_PSTORE_CONSOLE=y
> +CONFIG_PSTORE_RAM=y
> diff --git a/cgl/features/pstore/pstore.scc b/cgl/features/pstore/pstore.scc
> new file mode 100644
> index 0000000..ce7ca0c
> --- /dev/null
> +++ b/cgl/features/pstore/pstore.scc
> @@ -0,0 +1,4 @@
> +define KFEATURE_DESCRIPTION "Enable Persistent store support"
> +define KFEATURE_COMPATIBILITY all
> +
> +kconf non-hardware pstore.cfg
> diff --git a/cgl/features/qdisc/qdisc_stats.cfg b/cgl/features/qdisc/qdisc_stats.cfg
> new file mode 100644
> index 0000000..6f2ca34
> --- /dev/null
> +++ b/cgl/features/qdisc/qdisc_stats.cfg
> @@ -0,0 +1 @@
> +CONFIG_QDISC_STATS=y
> diff --git a/cgl/features/qdisc/qdisc_stats.scc b/cgl/features/qdisc/qdisc_stats.scc
> new file mode 100644
> index 0000000..9b6841b
> --- /dev/null
> +++ b/cgl/features/qdisc/qdisc_stats.scc
> @@ -0,0 +1 @@
> +kconf non-hardware qdisc_stats.cfg
> diff --git a/cgl/features/quota/quota.cfg b/cgl/features/quota/quota.cfg
> new file mode 100644
> index 0000000..3e202c0
> --- /dev/null
> +++ b/cgl/features/quota/quota.cfg
> @@ -0,0 +1,5 @@
> +CONFIG_QUOTA=y
> +CONFIG_PRINT_QUOTA_WARNING=y
> +CONFIG_QUOTA_TREE=m
> +CONFIG_QUOTACTL=y
> +CONFIG_QFMT_V2=m
> diff --git a/cgl/features/quota/quota.scc b/cgl/features/quota/quota.scc
> new file mode 100644
> index 0000000..10e7dc9
> --- /dev/null
> +++ b/cgl/features/quota/quota.scc
> @@ -0,0 +1,4 @@
> +define KFEATURE_DESCRIPTION "Enable quota support"
> +define KFEATURE_COMPATIBILITY all
> +
> +kconf non-hardware quota.cfg
> diff --git a/cgl/features/selinux/selinux-dev.cfg b/cgl/features/selinux/selinux-dev.cfg
> new file mode 100644
> index 0000000..de975d3
> --- /dev/null
> +++ b/cgl/features/selinux/selinux-dev.cfg
> @@ -0,0 +1,3 @@
> +CONFIG_SECURITY_SELINUX_BOOTPARAM=y
> +CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
> +CONFIG_SECURITY_SELINUX_DEVELOP=y
> diff --git a/cgl/features/selinux/selinux-dev.scc b/cgl/features/selinux/selinux-dev.scc
> new file mode 100644
> index 0000000..33f8784
> --- /dev/null
> +++ b/cgl/features/selinux/selinux-dev.scc
> @@ -0,0 +1,3 @@
> +define KFEATURE_DESCRIPTION "Enable SELinux development support"
> +define KFEATURE_COMPATIBILITY all
> +kconf non-hardware selinux-dev.cfg
> diff --git a/cgl/features/selinux/selinux.cfg b/cgl/features/selinux/selinux.cfg
> new file mode 100644
> index 0000000..b759da4
> --- /dev/null
> +++ b/cgl/features/selinux/selinux.cfg
> @@ -0,0 +1,11 @@
> +CONFIG_NETWORK_SECMARK=y
> +CONFIG_EXT2_FS_SECURITY=y
> +CONFIG_EXT3_FS_SECURITY=y
> +CONFIG_EXT4_FS_SECURITY=y
> +CONFIG_JFS_SECURITY=y
> +CONFIG_JFFS2_FS_SECURITY=y
> +CONFIG_SECURITY_NETWORK=y
> +CONFIG_SECURITY_SELINUX=y
> +CONFIG_SECURITY_SELINUX_DISABLE=y
> +CONFIG_SECURITY_SELINUX_AVC_STATS=y
> +CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
> diff --git a/cgl/features/selinux/selinux.scc b/cgl/features/selinux/selinux.scc
> new file mode 100644
> index 0000000..6621e2a
> --- /dev/null
> +++ b/cgl/features/selinux/selinux.scc
> @@ -0,0 +1,4 @@
> +define KFEATURE_DESCRIPTION "Enable SELinux support"
> +define KFEATURE_COMPATIBILITY all
> +include features/audit/audit.scc
> +kconf non-hardware selinux.cfg
> diff --git a/cgl/features/udp/udp_stats.cfg b/cgl/features/udp/udp_stats.cfg
> new file mode 100644
> index 0000000..3081c50
> --- /dev/null
> +++ b/cgl/features/udp/udp_stats.cfg
> @@ -0,0 +1 @@
> +CONFIG_DGRAM_SOCKSTATS=y
> diff --git a/cgl/features/udp/udp_stats.scc b/cgl/features/udp/udp_stats.scc
> new file mode 100644
> index 0000000..429ba47
> --- /dev/null
> +++ b/cgl/features/udp/udp_stats.scc
> @@ -0,0 +1 @@
> +kconf non-hardware udp_stats.cfg
> 



More information about the linux-yocto mailing list