diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch index e1ea504..4ea4d9a 100644 --- a/SOURCES/openvswitch-3.1.0.patch +++ b/SOURCES/openvswitch-3.1.0.patch @@ -3236,6 +3236,21 @@ index d12d9b8a5e..e9110462d2 100644 free(argcopy); return 0; +diff --git a/lib/dpdk.c b/lib/dpdk.c +index 240babc03e..704d5d84ba 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 c9f7179c3b..4c85ab4aad 100644 --- a/lib/dpif-netdev.c diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec index 7df71ab..f5d8c13 100644 --- a/SPECS/openvswitch3.1.spec +++ b/SPECS/openvswitch3.1.spec @@ -63,7 +63,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.1.0 -Release: 126%{?dist} +Release: 127%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -757,6 +757,12 @@ exit 0 %endif %changelog +* Wed Jun 19 2024 Open vSwitch CI - 3.1.0-127 +- Merging upstream branch-3.1 [RH git: 1b73710c1b] + Commit list: + e87d5b2483 dpdk: Check other_config:dpdk-extra for '--lcores'. + + * Fri Jun 07 2024 Open vSwitch CI - 3.1.0-126 - Merging upstream branch-3.1 [RH git: 3c1cb5564d] Commit list: