Browse Source

openvswitch: openvswitch.mk: add ovs_common_depends variable

This is to address the need that openvswitch starting with 2.13 now
depends on libunwind for handling SIGSEGV (upstream commit e2ed6fbeb18
("fatal-signal: Catch SIGSEGV and print backtrace"))

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
lilik-openwrt-22.03
Yousong Zhou 4 years ago
parent
commit
0fa07ed578
3 changed files with 6 additions and 2 deletions
  1. +3
    -1
      net/openvswitch/Makefile
  2. +2
    -1
      net/openvswitch/openvswitch.mk
  3. +1
    -0
      net/ovn/Makefile

+ 3
- 1
net/openvswitch/Makefile View File

@ -17,7 +17,7 @@ include ./openvswitch.mk
#
PKG_NAME:=openvswitch
PKG_VERSION:=$(ovs_version)
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.openvswitch.org/releases/
PKG_HASH:=dd5f727427e36cab22bdeae61529d8c8fccacc53d968cfa7658f7f935ddda531
@ -155,6 +155,8 @@ ovs_kmod_openvswitch-lisp-intree_depends:= +kmod-openvswitch-intree
ovs_kmod_openvswitch-lisp-intree_files:= $(ovs_kmod_intree_dir)/vport-lisp.ko
$(eval $(call OvsKmodPackageTemplate,openvswitch-lisp-intree))
ovs_common_depends:= +libatomic +libunbound +libunwind
# Dependency review
#
# for f in sbin/*; do echo $f; readelf -d $f | grep -i shared; done


+ 2
- 1
net/openvswitch/openvswitch.mk View File

@ -10,6 +10,7 @@ ovs_builddir=$(KERNEL_BUILD_DIR)/openvswitch-$(ovs_version)
# Shared vars, macros
ovs_common_depends:=
ovs_packages:=
ovs_package_name=$(if $(filter openvswitch,$(1)),openvswitch,openvswitch-$(1))
@ -21,7 +22,7 @@ define OvsPackageTemplate
URL:=https://www.openvswitch.org
TITLE:=$(ovs_$(1)_title)
HIDDEN:=$(ovs_$(1)_hidden)
DEPENDS:=$(ovs_$(1)_depends) +libatomic +libunbound
DEPENDS:=$(ovs_$(1)_depends) $(ovs_common_depends)
endef
define Package/$(call ovs_package_name,$(1))/install


+ 1
- 0
net/ovn/Makefile View File

@ -33,6 +33,7 @@ PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
include $(INCLUDE_DIR)/package.mk
include ../../lang/python/python3-host.mk
ovs_common_depends:= +libatomic +libunbound
ovs_libovn_title:=Open vSwitch (libovn.so)
ovs_libovn_hidden:=1


Loading…
Cancel
Save