base: fix ovn build failure (#3340)

Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>
kubeovn · Nov 16, 2023 · ec584f4 · ec584f4
1 parent aac2ae2
commit ec584f4
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
@@ -111,15 +111,12 @@ 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/168a3f20579b720370f137c82c04cf3b1a9811e2.patch" -OutFile ..\ovn-01.patch
           # add support for windows
-          Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/65b5de6304c1b974b11bab0945770488ccc09d2e.patch" -OutFile ..\ovn-02.patch
+          Invoke-WebRequest -Uri "https://github.com/kubeovn/ovn/commit/7fa6e3149aac69c131ef9f8efadf498a8cc8f289.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/4fa77ab0460150b9ac79d7308c81045c82633565.patch" -OutFile ..\ovn-03.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
@@ -44,8 +44,6 @@ RUN dpkg -i /usr/src/python3-openvswitch*.deb /usr/src/libopenvswitch*.deb
 
 RUN cd /usr/src/ && git clone -b branch-22.03 --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 && \
     # fix ssl listen address
     curl -s https://github.com/kubeovn/ovn/commit/dca043b2c35756fd370214fc40d61f755bd3a66f.patch | git apply && \
     # ovn-controller: Add a generic way to check if the daemon started recently.