diff options
author | Adrian Calianu <adrian.calianu@enea.com> | 2017-06-08 12:32:31 +0200 |
---|---|---|
committer | Adrian Calianu <adrian.calianu@enea.com> | 2017-06-08 12:32:31 +0200 |
commit | 02830801df12e8e656225708b1636179864f9928 (patch) | |
tree | 41bd5f671db2b8ba217d708ec72c18bfb796aef0 | |
parent | 6c9f970096f3dff240b0ab366d94a72f4fbd557c (diff) | |
download | enea-kernel-cache-02830801df12e8e656225708b1636179864f9928.tar.gz |
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 <adrian.calianu@enea.com>
-rw-r--r-- | features/openvswitch/ingress_policy.cfg | 3 | ||||
-rw-r--r-- | features/openvswitch/kernel_ovs.scc (renamed from features/openvswitch/vswitch.scc) | 3 | ||||
-rw-r--r-- | features/openvswitch/openvswitch.cfg | 1 | ||||
-rw-r--r-- | features/openvswitch/openvswitch_support.scc | 5 | ||||
-rw-r--r-- | features/openvswitch/tun.cfg | 1 | ||||
-rw-r--r-- | features/openvswitch/vswitch.cfg | 3 |
6 files changed, 12 insertions, 4 deletions
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 @@ | |||
1 | NET_CLS_BASIC=m | ||
2 | NET_ACT_POLICE=m | ||
3 | CONFIG_NET_SCH_INGRESS=m | ||
diff --git a/features/openvswitch/vswitch.scc b/features/openvswitch/kernel_ovs.scc index 2790b4f..2e3c131 100644 --- a/features/openvswitch/vswitch.scc +++ b/features/openvswitch/kernel_ovs.scc | |||
@@ -1,4 +1,5 @@ | |||
1 | define KFEATURE_DESCRIPTION "Enable in kernel OpenvSwitch module" | 1 | define KFEATURE_DESCRIPTION "Enable in kernel OpenvSwitch module" |
2 | define KFEATURE_COMPATIBILITY board | 2 | define KFEATURE_COMPATIBILITY board |
3 | 3 | ||
4 | kconf non-hardware vswitch.cfg | 4 | include features/openvswitch/openvswitch_support.scc |
5 | 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 @@ | |||
1 | define KFEATURE_DESCRIPTION "Enable OpenvSwitch support dependencies in kernel" | ||
2 | define KFEATURE_COMPATIBILITY board | ||
3 | |||
4 | kconf non-hardware ingress_policy.cfg | ||
5 | 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 @@ | |||
1 | CONFIG_OPENVSWITCH=m | ||
2 | CONFIG_NET_SCH_INGRESS=m | ||
3 | CONFIG_TUN=m | ||