diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch index 432a15b..429d090 100644 --- a/SOURCES/openvswitch-3.2.0.patch +++ b/SOURCES/openvswitch-3.2.0.patch @@ -24,10 +24,26 @@ index 99850a9434..8227a57487 100755 CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} -Wno-error=unused-command-line-argument" elif [ "$M32" ]; then diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh -index c28b6819a3..133e8d9673 100755 +index c28b6819a3..73a4500f54 100755 --- a/.ci/linux-prepare.sh +++ b/.ci/linux-prepare.sh -@@ -23,7 +23,7 @@ cd .. +@@ -12,10 +12,11 @@ fi + # + # Disabling sqlite support because sindex build fails and we don't + # really need this utility being installed. +-git clone git://git.kernel.org/pub/scm/devel/sparse/sparse.git +-cd sparse +-make -j4 HAVE_SQLITE= install +-cd .. ++if test -d sparse; then ++ pushd sparse ++ make -j4 HAVE_SQLITE= install ++ popd ++fi + + # Installing wheel separately because it may be needed to build some + # of the packages during dependency backtracking and pip >= 22.0 will +@@ -23,7 +24,7 @@ cd .. # https://github.com/pypa/pip/issues/10655 pip3 install --disable-pip-version-check --user wheel pip3 install --disable-pip-version-check --user \ @@ -52,7 +68,7 @@ index 48931fa085..fa3cc86b4e 100644 memory: 4G diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml -index 47d239f108..8ea8593209 100644 +index 47d239f108..92a5bcd50b 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -2,22 +2,28 @@ name: Build and Test @@ -175,7 +191,21 @@ index 47d239f108..8ea8593209 100644 with: path: dpdk-dir key: ${{ needs.build-dpdk.outputs.dpdk_key }} -@@ -200,9 +213,9 @@ jobs: +@@ -191,6 +204,13 @@ jobs: + if: matrix.m32 != '' + run: sudo apt install -y gcc-multilib + ++ - name: checkout sparse ++ uses: actions/checkout@v4 ++ # Official mirror of the git.kernel.org/pub/scm/devel/sparse/sparse.git. ++ with: ++ repository: lucvoo/sparse ++ path: sparse ++ + - name: prepare + run: ./.ci/linux-prepare.sh + +@@ -200,9 +220,9 @@ jobs: - name: copy logs on failure if: failure() || cancelled() run: | @@ -187,7 +217,7 @@ index 47d239f108..8ea8593209 100644 # So, we're just archiving everything here to avoid any issues. mkdir logs cp config.log ./logs/ -@@ -211,7 +224,7 @@ jobs: +@@ -211,7 +231,7 @@ jobs: - name: upload logs on failure if: failure() || cancelled() @@ -196,7 +226,7 @@ index 47d239f108..8ea8593209 100644 with: name: logs-linux-${{ join(matrix.*, '-') }} path: logs.tgz -@@ -230,15 +243,15 @@ jobs: +@@ -230,15 +250,15 @@ jobs: steps: - name: checkout @@ -215,7 +245,7 @@ index 47d239f108..8ea8593209 100644 - name: install dependencies run: brew install automake libtool - name: prepare -@@ -247,7 +260,7 @@ jobs: +@@ -247,7 +267,7 @@ jobs: run: ./.ci/osx-build.sh - name: upload logs on failure if: failure() @@ -224,7 +254,7 @@ index 47d239f108..8ea8593209 100644 with: name: logs-osx-clang---disable-ssl path: config.log -@@ -260,7 +273,7 @@ jobs: +@@ -260,7 +280,7 @@ jobs: DPDK: ${{ matrix.dpdk }} name: linux deb ${{ matrix.dpdk }} dpdk @@ -233,7 +263,7 @@ index 47d239f108..8ea8593209 100644 timeout-minutes: 30 strategy: -@@ -271,7 +284,7 @@ jobs: +@@ -271,7 +291,7 @@ jobs: steps: - name: checkout @@ -242,7 +272,7 @@ index 47d239f108..8ea8593209 100644 - name: update PATH run: | -@@ -293,7 +306,7 @@ jobs: +@@ -293,7 +313,7 @@ jobs: run: ./.ci/linux-build.sh - name: upload deb packages @@ -251,7 +281,7 @@ index 47d239f108..8ea8593209 100644 with: name: deb-packages-${{ matrix.dpdk }}-dpdk path: '/home/runner/work/ovs/*.deb' -@@ -301,7 +314,7 @@ jobs: +@@ -301,7 +321,7 @@ jobs: build-linux-rpm: name: linux rpm fedora runs-on: ubuntu-latest @@ -260,7 +290,7 @@ index 47d239f108..8ea8593209 100644 timeout-minutes: 30 strategy: -@@ -309,7 +322,7 @@ jobs: +@@ -309,7 +329,7 @@ jobs: steps: - name: checkout @@ -269,7 +299,7 @@ index 47d239f108..8ea8593209 100644 - name: install dependencies run: | dnf install -y rpm-build dnf-plugins-core -@@ -328,7 +341,7 @@ jobs: +@@ -328,7 +348,7 @@ jobs: run: dnf install -y rpm/rpmbuild/RPMS/*/*.rpm - name: upload rpm packages diff --git a/SPECS/openvswitch3.2.spec b/SPECS/openvswitch3.2.spec index 3e77255..c30310a 100644 --- a/SPECS/openvswitch3.2.spec +++ b/SPECS/openvswitch3.2.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.2.0 -Release: 121%{?dist} +Release: 122%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -763,6 +763,12 @@ exit 0 %endif %changelog +* Fri Mar 07 2025 Open vSwitch CI - 3.2.0-122 +- Merging upstream branch-3.2 [RH git: ea1b1f0586] + Commit list: + dca13c9c85 github: Get sparse from the official GitHub mirror. + + * Fri Feb 28 2025 Open vSwitch CI - 3.2.0-121 - Merging upstream branch-3.2 [RH git: e48554605f] Commit list: