diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch index 71a4fd5..3b2e660 100644 --- a/SOURCES/openvswitch-3.3.0.patch +++ b/SOURCES/openvswitch-3.3.0.patch @@ -35,10 +35,26 @@ index bf9d6241d5..702feeb3bb 100755 if [ ! -f "${VERSION_FILE}" ]; then echo "Could not find DPDK in $DPDK_INSTALL_DIR" diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh -index 5028bdc442..5f8a1db6af 100755 +index 5028bdc442..51e5a7e7dd 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 \ @@ -69,7 +85,7 @@ index d8a9722809..9f0fbfe40d 100644 matrix: COMPILER: gcc diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml -index fc75581486..783a1d79eb 100644 +index fc75581486..2b984548a5 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -2,17 +2,23 @@ name: Build and Test @@ -228,7 +244,21 @@ index fc75581486..783a1d79eb 100644 - name: install libunbound libunwind python3-unbound # GitHub Actions doesn't have 32-bit versions of these libraries. if: matrix.m32 == '' -@@ -264,17 +332,20 @@ jobs: +@@ -238,6 +306,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 + +@@ -264,17 +339,20 @@ jobs: name: logs-linux-${{ join(matrix.*, '-') }} path: logs.tgz @@ -254,7 +284,7 @@ index fc75581486..783a1d79eb 100644 timeout-minutes: 30 steps: -@@ -344,35 +415,86 @@ jobs: +@@ -344,35 +422,86 @@ jobs: key: ${{ steps.cache_key.outputs.key }} - name: set up python @@ -346,7 +376,7 @@ index fc75581486..783a1d79eb 100644 - name: build run: ./.ci/linux-build.sh -@@ -399,7 +521,7 @@ jobs: +@@ -399,7 +528,7 @@ jobs: - name: set up python uses: actions/setup-python@v5 with: @@ -355,7 +385,7 @@ index fc75581486..783a1d79eb 100644 - name: install dependencies run: brew install automake libtool - name: prepare -@@ -421,7 +543,7 @@ jobs: +@@ -421,7 +550,7 @@ jobs: DPDK: ${{ matrix.dpdk }} name: linux deb ${{ matrix.dpdk }} dpdk @@ -364,7 +394,7 @@ index fc75581486..783a1d79eb 100644 timeout-minutes: 30 strategy: -@@ -462,7 +584,7 @@ jobs: +@@ -462,7 +591,7 @@ jobs: build-linux-rpm: name: linux rpm fedora runs-on: ubuntu-latest diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec index acdc8a0..7a3a3d0 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.4 -Release: 99%{?dist} +Release: 100%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -786,6 +786,12 @@ exit 0 %endif %changelog +* Fri Mar 07 2025 Open vSwitch CI - 3.3.0-100 +- Merging upstream branch-3.3 [RH git: 75546d73bc] + Commit list: + fd01fdfafc github: Get sparse from the official GitHub mirror. + + * Fri Feb 28 2025 Open vSwitch CI - 3.3.0-99 - Merging upstream branch-3.3 [RH git: 09c9d5435f] Commit list: