From 02830801df12e8e656225708b1636179864f9928 Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Thu, 8 Jun 2017 12:32:31 +0200 Subject: ovs: rework ovs configs according to http://docs.openvswitch.org/en/latest/intro/install/general/ ovs kernel module exists in two places: - in kernel tree, which cane be enabled with kernel_ovs.scc - in OVS tree, which can be enabled with openvswitch_support.scc (adding only the support required by OVS in kernel) and the module is built from OVS source tree, separatly. Signed-off-by: Adrian Calianu --- features/openvswitch/ingress_policy.cfg | 3 +++ features/openvswitch/kernel_ovs.scc | 5 +++++ features/openvswitch/openvswitch.cfg | 1 + features/openvswitch/openvswitch_support.scc | 5 +++++ features/openvswitch/tun.cfg | 1 + features/openvswitch/vswitch.cfg | 3 --- features/openvswitch/vswitch.scc | 4 ---- 7 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 features/openvswitch/ingress_policy.cfg create mode 100644 features/openvswitch/kernel_ovs.scc create mode 100644 features/openvswitch/openvswitch.cfg create mode 100644 features/openvswitch/openvswitch_support.scc create mode 100644 features/openvswitch/tun.cfg delete mode 100644 features/openvswitch/vswitch.cfg delete mode 100644 features/openvswitch/vswitch.scc diff --git a/features/openvswitch/ingress_policy.cfg b/features/openvswitch/ingress_policy.cfg new file mode 100644 index 0000000..e0e09a5 --- /dev/null +++ b/features/openvswitch/ingress_policy.cfg @@ -0,0 +1,3 @@ +NET_CLS_BASIC=m +NET_ACT_POLICE=m +CONFIG_NET_SCH_INGRESS=m diff --git a/features/openvswitch/kernel_ovs.scc b/features/openvswitch/kernel_ovs.scc new file mode 100644 index 0000000..2e3c131 --- /dev/null +++ b/features/openvswitch/kernel_ovs.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "Enable in kernel OpenvSwitch module" +define KFEATURE_COMPATIBILITY board + +include features/openvswitch/openvswitch_support.scc +kconf non-hardware openvswitch.cfg diff --git a/features/openvswitch/openvswitch.cfg b/features/openvswitch/openvswitch.cfg new file mode 100644 index 0000000..82b61f8 --- /dev/null +++ b/features/openvswitch/openvswitch.cfg @@ -0,0 +1 @@ +CONFIG_OPENVSWITCH=m diff --git a/features/openvswitch/openvswitch_support.scc b/features/openvswitch/openvswitch_support.scc new file mode 100644 index 0000000..59d5f36 --- /dev/null +++ b/features/openvswitch/openvswitch_support.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "Enable OpenvSwitch support dependencies in kernel" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware ingress_policy.cfg +kconf non-hardware tun.cfg diff --git a/features/openvswitch/tun.cfg b/features/openvswitch/tun.cfg new file mode 100644 index 0000000..12009e3 --- /dev/null +++ b/features/openvswitch/tun.cfg @@ -0,0 +1 @@ +CONFIG_TUN=m diff --git a/features/openvswitch/vswitch.cfg b/features/openvswitch/vswitch.cfg deleted file mode 100644 index dce03a3..0000000 --- a/features/openvswitch/vswitch.cfg +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_OPENVSWITCH=m -CONFIG_NET_SCH_INGRESS=m -CONFIG_TUN=m diff --git a/features/openvswitch/vswitch.scc b/features/openvswitch/vswitch.scc deleted file mode 100644 index 2790b4f..0000000 --- a/features/openvswitch/vswitch.scc +++ /dev/null @@ -1,4 +0,0 @@ -define KFEATURE_DESCRIPTION "Enable in kernel OpenvSwitch module" -define KFEATURE_COMPATIBILITY board - -kconf non-hardware vswitch.cfg -- cgit v1.2.3-54-g00ecf