treewide: refresh hashes after move to use ZSTD as default

[feed/packages.git] / net / ovn / Makefile

diff --git a/net/ovn/Makefile b/net/ovn/Makefile
index 62c35ae9a9a5ad0f82432453e84d7f9924dd0bd2..e807aac693c5a82b2c6a4c32e7cd4adcf65f4976 100644 (file)
--- a/net/ovn/Makefile
+++ b/net/ovn/Makefile
@@ -9,21 +9,21 @@ include $(INCLUDE_DIR)/kernel.mk
 include ../openvswitch/openvswitch.mk
 
 PKG_NAME:=ovn
-PKG_VERSION:=20.06.1
-PKG_RELEASE:=3
+PKG_VERSION:=22.03.5
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/ovn-org/ovn.git
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
-PKG_MIRROR_HASH:=046002c271fd29c496be53b5673a7ede6f381343bef49732e9bd17ed1454940e
+PKG_MIRROR_HASH:=5236f459dccdf3d4ccfaabfdb075dbec4b332821ac8ebb86fcfa9a7c9b3d80f7
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:openvswitch:openvswitch
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DEPENDS+=python3/host python-six/host
-PKG_USE_MIPS16:=0
+PKG_BUILD_DEPENDS+=python3/host
+PKG_BUILD_FLAGS:=no-mips16 lto
 PKG_BUILD_PARALLEL:=1
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
@@ -35,7 +35,7 @@ include ../../lang/python/python3-host.mk
 
 ovs_libovn_title:=Open vSwitch (libovn.so)
 ovs_libovn_hidden:=1
-ovs_libovn_depends+=+libatomic
+ovs_libovn_depends+=+libatomic +openvswitch-libopenvswitch
 ovs_libovn_files:=usr/lib/libovn*.so*
 $(eval $(call OvsPackageTemplate,libovn))
 
@@ -47,7 +47,7 @@ ovs_ovn-common_depends+=+libatomic
 ovs_ovn-common_files:= \
        usr/share/ovn/scripts/ovn-ctl \
        usr/share/ovn/scripts/ovn-lib \
-       $(foreach b,ovn-nbctl ovn-sbctl,usr/bin/$(b))
+       $(foreach b,ovn-appctl ovn-nbctl ovn-sbctl,usr/bin/$(b))
 define ovs_ovn-common_install
        $$(LN) /usr/share/openvswitch/scripts/ovs-ctl-wrapper $$(1)/usr/bin/ovn-ctl
 endef
@@ -87,7 +87,12 @@ CONFIGURE_VARS += \
        ovs_cv_python3=$(HOST_PYTHON3_BIN) \
 
 
-TARGET_CFLAGS += -flto -std=gnu99
+TARGET_CFLAGS += -std=gnu99
+# This is needed otherwise libtool --mode=install libovn.la will fail with
+# "cannot find -lopenvswitch" when doing libtool --mode=relink.  Likely this
+# was caused by libovn now depends on libopenvswitch.la (installed=no) since
+# upstream commit 1b587c4f ("controller: add datapath meter capability check")
+TARGET_LDFLAGS += -L$(ovs_builddir)/lib/.libs
 MAKE_VARS += PYTHONPATH="$(HOST_PYTHON3PATH)"
 
 $(foreach p,$(ovs_packages),\