From 558c2a654c335c8fa124f7734d5232fedd1135b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= Date: Tue, 29 Aug 2023 14:27:33 +0800 Subject: [PATCH] fix ovn build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 张祖建 --- .github/workflows/build-windows.yaml | 11 +++++++---- dist/images/Dockerfile.base | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml index bfa6cfebbfdc..a67d711c0581 100644 --- a/.github/workflows/build-windows.yaml +++ b/.github/workflows/build-windows.yaml @@ -112,18 +112,21 @@ jobs: - name: Apply OVN patches working-directory: ovn run: | + # python: Rename build related code to ovs_build_helpers. + Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/9d961aec6fd7ef3e3002bc34e285833279e989c2.patch" -OutFile ..\ovn-01.patch # change hash type from dp_hash to hash with field src_ip - Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/5a04402c01df1463b9e1edcbc1c5634793687140.patch" -OutFile ..\ovn-01.patch + Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/5a04402c01df1463b9e1edcbc1c5634793687140.patch" -OutFile ..\ovn-02.patch # add support for windows - Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/2c85af7097e4c39d225c98dc68b55a964d0197d7.patch" -OutFile ..\ovn-02.patch + Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/2c85af7097e4c39d225c98dc68b55a964d0197d7.patch" -OutFile ..\ovn-03.patch # set br-int controller to TCP 127.0.0.1:6653 - Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/24dcd9485ebb0f6c962250684fae512850cd9210.patch" -OutFile ..\ovn-03.patch + Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/24dcd9485ebb0f6c962250684fae512850cd9210.patch" -OutFile ..\ovn-04.patch # ovn-controller: do not send GARP on localnet for Kube-OVN ports - Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/30ff0ba51745f5ea1b38ed63e8cd8e0479d0f916.patch" -OutFile ..\ovn-04.patch + Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/30ff0ba51745f5ea1b38ed63e8cd8e0479d0f916.patch" -OutFile ..\ovn-05.patch git apply ..\ovn-01.patch git apply ..\ovn-02.patch git apply ..\ovn-03.patch git apply ..\ovn-04.patch + git apply ..\ovn-05.patch - name: Build PTHREADS4W working-directory: pthreads4w\code diff --git a/dist/images/Dockerfile.base b/dist/images/Dockerfile.base index d459bd8b3816..b98e31ce1ff0 100644 --- a/dist/images/Dockerfile.base +++ b/dist/images/Dockerfile.base @@ -29,6 +29,8 @@ RUN cd /usr/src/ && \ RUN cd /usr/src/ && git clone -b branch-22.12 --depth=1 https://github.com/ovn-org/ovn.git && \ cd ovn && \ + # python: Rename build related code to ovs_build_helpers. + curl -s https://github.com/kubeovn/ovn/commit/9d961aec6fd7ef3e3002bc34e285833279e989c2.patch | git apply && \ # change hash type from dp_hash to hash with field src_ip curl -s https://github.com/kubeovn/ovn/commit/daa09e380eec61620d4ee317e3265c44366d1147.patch | git apply && \ # set ether dst addr for dnat on logical switch