From 0ab14d82b1b1aec59dc6c7f180f2688ccee1459e Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Wed, 12 Feb 2020 12:51:44 -0500 Subject: openvswitch: uprev from v2.11 to v2.12 A mostly straightforward uprev. Unfortunately a required patch for python3 is only available on a non-release branch so we must carry it in order to build (the discussion on the mailing list was that an uprev might have avoided this, but this is not the case). The ptest results are similar to after the v2.11 uprev ERROR: 2413 tests were run, 23 failed unexpectedly. 383 tests were skipped. NOTE, however, that they have now marked many tests as 'skipped', such as the python2 results, so the failed and skipped numbers have essentially swapped with each other. The failed tests were in the following areas: checkpatch.at (5) ovs-ofctl.at (1) dpif-netdev.at (1) ofproto-dpif.at (6) bridge.at (2) ovn.at (2) ovn-controller-vtep.at (6) Most were issues with the test or expectations that source code would be available. There might be an issue around packaging of "/vswitchd/vswitch.ovsschema" but we should be able to overlook this for now, as we have with previous versions. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- .../systemd-update-tool-paths.patch | 32 ++++++++++++---------- 1 file changed, 17 insertions(+), 15 deletions(-) (limited to 'recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch') 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 d7d4c159..aae44fe7 100644 --- a/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch +++ b/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch @@ -1,7 +1,7 @@ -From 163020a5bba1323dc337d72d4771bb81d824b0dc Mon Sep 17 00:00:00 2001 +From efd6b8f03ef7278d2477833f84bb8488bd0c346d Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 29 May 2018 18:57:46 +0000 -Subject: [PATCH] systemd: update tool paths +Subject: [PATCH 1/2] systemd: update tool paths We are using the rhel files but we install our tools in a slightly different path, update accordingly. @@ -9,16 +9,16 @@ different path, update accordingly. Signed-off-by: Mark Asselstine --- rhel/usr_lib_systemd_system_ovs-vswitchd.service.in | 4 ++-- - rhel/usr_lib_systemd_system_ovsdb-server.service | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) + rhel/usr_lib_systemd_system_ovsdb-server.service | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in -index 11b34c6..94c48f8 100644 +index ff43dae..f88b57c 100644 --- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in +++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in -@@ -15,8 +15,8 @@ EnvironmentFile=/etc/openvswitch/default.conf - EnvironmentFile=-/etc/sysconfig/openvswitch - EnvironmentFile=-/run/openvswitch/useropts +@@ -17,8 +17,8 @@ EnvironmentFile=-/etc/sysconfig/openvswitch + EnvironmentFile=-/run/openvswitch.useropts + LimitSTACK=2M @begin_dpdk@ -ExecStartPre=-/bin/sh -c '/usr/bin/chown :$${OVS_USER_ID##*:} /dev/hugepages' -ExecStartPre=-/usr/bin/chmod 0775 /dev/hugepages @@ -28,18 +28,20 @@ index 11b34c6..94c48f8 100644 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 70da1ec..694598f 100644 +index 4c170c0..aad557f 100644 --- a/rhel/usr_lib_systemd_system_ovsdb-server.service +++ b/rhel/usr_lib_systemd_system_ovsdb-server.service -@@ -10,8 +10,8 @@ Type=forking +@@ -11,9 +11,9 @@ PIDFile=/var/run/openvswitch/ovsdb-server.pid Restart=on-failure EnvironmentFile=/etc/openvswitch/default.conf EnvironmentFile=-/etc/sysconfig/openvswitch --ExecStartPre=/usr/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch --ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch/useropts; if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /usr/bin/echo "OVSUSER=--ovs-user=${OVS_USER_ID}" > /run/openvswitch/useropts; fi' -+ExecStartPre=/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch -+ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch/useropts; if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /bin/echo "OVSUSER=--ovs-user=${OVS_USER_ID}" > /run/openvswitch/useropts; fi' - EnvironmentFile=-/run/openvswitch/useropts +-ExecStartPre=-/usr/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch +-ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch.useropts; /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/sh -c 'rm -f /run/openvswitch.useropts; /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' + EnvironmentFile=-/run/openvswitch.useropts ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ --no-ovs-vswitchd --no-monitor --system-id=random \ -- -- cgit v1.2.3-54-g00ecf