diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch index 9e65b81..c880f16 100644 --- a/SOURCES/openvswitch-3.3.0.patch +++ b/SOURCES/openvswitch-3.3.0.patch @@ -683,6 +683,21 @@ index 34ee7d0e2d..151848b909 100644 n = odp_ufid_from_string(key_s, &ufid); if (n < 0) { dpctl_error(dpctl_p, -n, "parsing flow ufid"); +diff --git a/lib/dpdk.c b/lib/dpdk.c +index d76d53f8f1..940c43c070 100644 +--- a/lib/dpdk.c ++++ b/lib/dpdk.c +@@ -337,7 +337,9 @@ dpdk_init__(const struct smap *ovs_other_config) + } + #endif + +- if (args_contains(&args, "-c") || args_contains(&args, "-l")) { ++ if (args_contains(&args, "-c") || ++ args_contains(&args, "-l") || ++ args_contains(&args, "--lcores")) { + auto_determine = false; + } + diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 46e24d204d..99ff9b3693 100644 --- a/lib/dpif-netdev.c diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec index fa80d0e..f841943 100644 --- a/SPECS/openvswitch3.3.spec +++ b/SPECS/openvswitch3.3.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.3.0 -Release: 30%{?dist} +Release: 31%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -767,6 +767,12 @@ exit 0 %endif %changelog +* Wed Jun 19 2024 Open vSwitch CI - 3.3.0-31 +- Merging upstream branch-3.3 [RH git: 92e783ebee] + Commit list: + 830fd48237 dpdk: Check other_config:dpdk-extra for '--lcores'. + + * Fri Jun 07 2024 Open vSwitch CI - 3.3.0-30 - Merging upstream branch-3.3 [RH git: b79bfd3e3b] Commit list: