From b931b5bfd42792b0ebb8ba15f7a1c4448bea352c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=A5=96=E5=BB=BA?= Date: Fri, 16 Jun 2023 09:56:02 +0800 Subject: [PATCH] Revert "base: fix ovn build failure (#2926)" This reverts commit 3796d1efb813b85e54c2982116ca4f76e909762c. --- dist/images/Dockerfile.base | 2 -- 1 file changed, 2 deletions(-) diff --git a/dist/images/Dockerfile.base b/dist/images/Dockerfile.base index b7a522f9037..56238b66b5f 100644 --- a/dist/images/Dockerfile.base +++ b/dist/images/Dockerfile.base @@ -42,8 +42,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 && \ - # Revert "call ovsrcu_exit() before exit in ovn-northd and ovn-controller to make valgrind happy" - curl -s https://github.com/kubeovn/ovn/commit/7be7605993968c78853ce0072cc405f494a10ccd.patch | git apply && \ # fix ssl listen address curl -s https://github.com/kubeovn/ovn/commit/7992d55af9ac356d3ad934764f473d1b6aa4cf64.patch | git apply && \ # ovn-controller: Add a generic way to check if the daemon started recently.