4 files changed, 23 insertions, 136 deletions

diff --git a/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch b/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch
deleted file mode 100644
index 8bda865f..00000000
--- a/recipes-networking/openvswitch/files/0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From ae55fa8168b4b9692ad757c54255a89f935c587e Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Thu, 11 Mar 2021 11:35:24 +0800
-Subject: [PATCH] ovs: use /run instead of /var/run for in systemd units
-
-Upstream-Status: Pending
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- rhel/etc_logrotate.d_openvswitch                            | 4 ++--
- rhel/usr_lib_systemd_system_openvswitch-ipsec.service       | 2 +-
- ...sr_lib_systemd_system_ovs-delete-transient-ports.service | 2 +-
- rhel/usr_lib_systemd_system_ovs-vswitchd.service.in         | 6 +++---
- rhel/usr_lib_systemd_system_ovsdb-server.service            | 6 +++---
- 5 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/rhel/etc_logrotate.d_openvswitch b/rhel/etc_logrotate.d_openvswitch
-index f4302ffbc..c0f476744 100644
---- a/rhel/etc_logrotate.d_openvswitch
-+++ b/rhel/etc_logrotate.d_openvswitch
-@@ -13,8 +13,8 @@
-     missingok
-     postrotate
-         # Tell Open vSwitch daemons to reopen their log files
--        if [ -d /var/run/openvswitch ]; then
--            for ctl in /var/run/openvswitch/*.ctl; do
-+        if [ -d /run/openvswitch ]; then
-+            for ctl in /run/openvswitch/*.ctl; do
-                 ovs-appctl -t "$ctl" vlog/reopen 2>/dev/null || :
-             done
-         fi
-diff --git a/rhel/usr_lib_systemd_system_openvswitch-ipsec.service b/rhel/usr_lib_systemd_system_openvswitch-ipsec.service
-index d8f47af68..92dad44f9 100644
---- a/rhel/usr_lib_systemd_system_openvswitch-ipsec.service
-+++ b/rhel/usr_lib_systemd_system_openvswitch-ipsec.service
-@@ -5,7 +5,7 @@ After=openvswitch.service
- 
- [Service]
- Type=forking
--PIDFile=/var/run/openvswitch/ovs-monitor-ipsec.pid
-+PIDFile=/run/openvswitch/ovs-monitor-ipsec.pid
- ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
-                     --ike-daemon=libreswan start-ovs-ipsec
- ExecStop=/usr/share/openvswitch/scripts/ovs-ctl stop-ovs-ipsec
-diff --git a/rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service b/rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service
-index 4cd4d7f57..d4d7b204b 100644
---- a/rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service
-+++ b/rhel/usr_lib_systemd_system_ovs-delete-transient-ports.service
-@@ -2,7 +2,7 @@
- Description=Open vSwitch Delete Transient Ports
- After=ovsdb-server.service
- Before=ovs-vswitchd.service
--AssertPathExists=/var/run/openvswitch/db.sock
-+AssertPathExists=/run/openvswitch/db.sock
- 
- [Service]
- Type=oneshot
-diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
-index f88b57cae..82748bf2d 100644
---- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
-+++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
-@@ -4,14 +4,14 @@ After=ovsdb-server.service network-pre.target systemd-udev-settle.service
- Before=network.target network.service
- Requires=ovsdb-server.service
- ReloadPropagatedFrom=ovsdb-server.service
--AssertPathIsReadWrite=/var/run/openvswitch/db.sock
-+AssertPathIsReadWrite=/run/openvswitch/db.sock
- PartOf=openvswitch.service
- 
- [Service]
- Type=forking
--PIDFile=/var/run/openvswitch/ovs-vswitchd.pid
-+PIDFile=/run/openvswitch/ovs-vswitchd.pid
- Restart=on-failure
--Environment=XDG_RUNTIME_DIR=/var/run/openvswitch
-+Environment=XDG_RUNTIME_DIR=/run/openvswitch
- EnvironmentFile=/etc/openvswitch/default.conf
- EnvironmentFile=-/etc/sysconfig/openvswitch
- EnvironmentFile=-/run/openvswitch.useropts
-diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service
-index 74e5acb7f..39698f238 100644
---- a/rhel/usr_lib_systemd_system_ovsdb-server.service
-+++ b/rhel/usr_lib_systemd_system_ovsdb-server.service
-@@ -7,7 +7,7 @@ PartOf=openvswitch.service
- 
- [Service]
- Type=forking
--PIDFile=/var/run/openvswitch/ovsdb-server.pid
-+PIDFile=/run/openvswitch/ovsdb-server.pid
- Restart=on-failure
- EnvironmentFile=/etc/openvswitch/default.conf
- EnvironmentFile=-/etc/sysconfig/openvswitch
-@@ -17,8 +17,8 @@ EnvironmentFile=-/run/openvswitch.useropts
- # remove openvswitch.useropts first to reload a fresh
- # OVS_USER_ID from default.conf or sysconfig.
- ExecStartPre=/bin/rm -f /run/openvswitch.useropts
--ExecStartPre=-/bin/mkdir /var/run/openvswitch /var/log/openvswitch
--ExecStartPre=-/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch
-+ExecStartPre=-/bin/mkdir -p /run/openvswitch /var/log/openvswitch
-+ExecStartPre=-/bin/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch
- ExecStartPre=/bin/sh -c '/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts'
- ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi'
- ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
--- 
-2.17.1
-
diff --git a/recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch b/recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch
index 12b9e17a..7f6e5422 100644
--- a/recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch
@@ -14,19 +14,16 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
  rhel/usr_lib_systemd_system_ovsdb-server.service | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service
-index 5002ddf10..74e5acb7f 100644
---- a/rhel/usr_lib_systemd_system_ovsdb-server.service
-+++ b/rhel/usr_lib_systemd_system_ovsdb-server.service
-@@ -17,7 +17,7 @@ EnvironmentFile=-/run/openvswitch.useropts
+Index: git/rhel/usr_lib_systemd_system_ovsdb-server.service
+===================================================================
+--- git.orig/rhel/usr_lib_systemd_system_ovsdb-server.service
++++ git/rhel/usr_lib_systemd_system_ovsdb-server.service
+@@ -17,7 +17,7 @@
  # remove openvswitch.useropts first to reload a fresh
  # OVS_USER_ID from default.conf or sysconfig.
  ExecStartPre=/bin/rm -f /run/openvswitch.useropts
 -
 +ExecStartPre=-/bin/mkdir /var/run/openvswitch /var/log/openvswitch
- ExecStartPre=-/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch
+ ExecStartPre=-/bin/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch
  ExecStartPre=/bin/sh -c '/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts'
  ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi'
--- 
-2.17.1
-
diff --git a/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch b/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch
index be6fa5d9..a9eae832 100644
--- a/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch
@@ -12,11 +12,11 @@ Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
  rhel/usr_lib_systemd_system_ovsdb-server.service    | 8 ++++----
  2 files changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
-index ff43dae96..f88b57cae 100644
---- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
-+++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
-@@ -17,8 +17,8 @@ EnvironmentFile=-/etc/sysconfig/openvswitch
+Index: git/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
+===================================================================
+--- git.orig/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
++++ git/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
+@@ -17,8 +17,8 @@
  EnvironmentFile=-/run/openvswitch.useropts
  LimitSTACK=2M
  @begin_dpdk@
@@ -27,26 +27,23 @@ index ff43dae96..f88b57cae 100644
  @end_dpdk@
  ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
            --no-ovsdb-server --no-monitor --system-id=random \
-diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service
-index 98338b9df..5002ddf10 100644
---- a/rhel/usr_lib_systemd_system_ovsdb-server.service
-+++ b/rhel/usr_lib_systemd_system_ovsdb-server.service
-@@ -16,11 +16,11 @@ EnvironmentFile=-/run/openvswitch.useropts
+Index: git/rhel/usr_lib_systemd_system_ovsdb-server.service
+===================================================================
+--- git.orig/rhel/usr_lib_systemd_system_ovsdb-server.service
++++ git/rhel/usr_lib_systemd_system_ovsdb-server.service
+@@ -16,11 +16,11 @@
  # Environment is reloaded for each Exec*, make sure to
  # remove openvswitch.useropts first to reload a fresh
  # OVS_USER_ID from default.conf or sysconfig.
 -ExecStartPre=/usr/bin/rm -f /run/openvswitch.useropts
 +ExecStartPre=/bin/rm -f /run/openvswitch.useropts
-
--ExecStartPre=-/usr/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch
+ 
+-ExecStartPre=-/usr/bin/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch
 -ExecStartPre=/bin/sh -c '/usr/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts'
 -ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /usr/bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi'
-+ExecStartPre=-/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch
++ExecStartPre=-/bin/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch
 +ExecStartPre=/bin/sh -c '/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts'
 +ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi'
  ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
            --no-ovs-vswitchd --no-monitor --system-id=random \
            ${OVS_USER_OPT} \
--- 
-2.17.1
-
diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb
index 4d413170..7051ac5c 100644
--- a/recipes-networking/openvswitch/openvswitch_git.bb
+++ b/recipes-networking/openvswitch/openvswitch_git.bb
@@ -14,20 +14,19 @@ RDEPENDS:${PN}-ptest += "\
         "
 
 S = "${WORKDIR}/git"
-PV = "2.15.3+${SRCPV}"
-CVE_VERSION = "2.15.3"
+PV = "2.17.0+${SRCPV}"
+CVE_VERSION = "2.17.0"
 
 FILESEXTRAPATHS:append := "${THISDIR}/${PN}-git:"
 
-SRCREV = "e4d2df62e65a615e19f62e2fd294709be8d75cdc"
-SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=https;branch=branch-2.15 \
+SRCREV = "2404d45367d104e74cc9eea50d27dcaa8c8917c0"
+SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=https;branch=branch-2.17 \
             file://openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch \
             file://run-ptest \
             file://disable_m4_check.patch \
             file://kernel_module.patch \
             file://systemd-update-tool-paths.patch \
             file://systemd-create-runtime-dirs.patch \
-            file://0001-ovs-use-run-instead-of-var-run-for-in-systemd-units.patch \
            "
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=1ce5d23a6429dff345518758f13aaeab"