diff --git a/SOURCES/openvswitch-2.16.0.patch b/SOURCES/openvswitch-2.16.0.patch index 2e8fc9b..a40e55e 100644 --- a/SOURCES/openvswitch-2.16.0.patch +++ b/SOURCES/openvswitch-2.16.0.patch @@ -66,9 +66,27 @@ index 358f2ba256..a4d2a5bbcd 100644 COMPILER: gcc COMPILER: clang diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml -index e2350c6d9d..7434ad18ec 100644 +index e2350c6d9d..2074c1de0e 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml +@@ -6,7 +6,7 @@ jobs: + build-linux: + env: + dependencies: | +- automake libtool gcc bc libjemalloc1 libjemalloc-dev \ ++ automake libtool gcc bc libjemalloc2 libjemalloc-dev \ + libssl-dev llvm-dev libelf-dev libnuma-dev libpcap-dev \ + ninja-build selinux-policy-dev + deb_dependencies: | +@@ -25,7 +25,7 @@ jobs: + TESTSUITE: ${{ matrix.testsuite }} + + name: linux ${{ join(matrix.*, ' ') }} +- runs-on: ubuntu-18.04 ++ runs-on: ubuntu-20.04 + timeout-minutes: 30 + + strategy: @@ -127,7 +127,7 @@ jobs: - name: set up python uses: actions/setup-python@v2 @@ -855,6 +873,18 @@ index 239d210b96..522e10b0e5 100644 openvswitch (2.16.0-1) unstable; urgency=low * New upstream version +diff --git a/debian/control b/debian/control +index 6420b9d3e2..27359a297d 100644 +--- a/debian/control ++++ b/debian/control +@@ -9,6 +9,7 @@ Build-Depends: graphviz, + bzip2, + debhelper (>= 8), + dh-autoreconf, ++ dh-python, + libssl-dev, + libtool, + openssl, diff --git a/dpdk/lib/librte_vhost/vhost_user.c b/dpdk/lib/librte_vhost/vhost_user.c index 45c8ac09da..70d206dcf8 100644 --- a/dpdk/lib/librte_vhost/vhost_user.c diff --git a/SPECS/openvswitch2.16.spec b/SPECS/openvswitch2.16.spec index 76d5555..de215b0 100644 --- a/SPECS/openvswitch2.16.spec +++ b/SPECS/openvswitch2.16.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.16.0 -Release: 93%{?dist} +Release: 94%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -699,6 +699,12 @@ exit 0 %endif %changelog +* Tue Aug 09 2022 Open vSwitch CI - 2.16.0-94 +- Merging upstream branch-2.16 [RH git: 200df9decf] + Commit list: + 3e1750eee2 github: Move CI to ubuntu 20.04 base image. + + * Mon Aug 08 2022 Open vSwitch CI - 2.16.0-93 - Merging upstream branch-2.16 [RH git: 3bb0f66a11] Commit list: