base: fix ovn build failure (#3340)

Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
kubeovn · Nov 16, 2023 · 45e7f1f · 45e7f1f
1 parent d6adcca
commit 45e7f1f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/.github/workflows/build-windows.yaml b/.github/workflows/build-windows.yaml
@@ -112,17 +112,14 @@ 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-00.patch
           # change hash type from dp_hash to hash with field src_ip
           Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/75876f75203bbf06a8f5ffb5628eca98bef03407.patch" -OutFile ..\ovn-01.patch
           # add support for windows
-          Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/2be843b9fc7cba253fb27fc57c384034e97db148.patch" -OutFile ..\ovn-02.patch
+          Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/e27cd770e5f5bffb884483546564ce6f286545c2.patch" -OutFile ..\ovn-02.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
           # 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
-          git apply ..\ovn-00.patch
           git apply ..\ovn-01.patch
           git apply ..\ovn-02.patch
           git apply ..\ovn-03.patch

diff --git a/dist/images/Dockerfile.base b/dist/images/Dockerfile.base
@@ -29,8 +29,6 @@ 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/4ad8763f707ff4088ae61396c7931e8735f71f22.patch | git apply && \
     # set ether dst addr for dnat on logical switch