diff options
| author | Yousong Zhou <yszhou4tech@gmail.com> | 2020-03-24 09:53:06 +0800 |
|---|---|---|
| committer | Yousong Zhou <yszhou4tech@gmail.com> | 2020-03-24 10:45:57 +0800 |
| commit | 0fa07ed578fad68609974b999bc4f75340e6f250 (patch) | |
| tree | b4f8a620024cc6693b755056c32ccf59ad0287e8 /net/openvswitch | |
| parent | b85e387cc2dec49ccaf0063f2b109e5c6151de39 (diff) | |
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>
Diffstat (limited to 'net/openvswitch')
| -rw-r--r-- | net/openvswitch/Makefile | 4 | ||||
| -rw-r--r-- | net/openvswitch/openvswitch.mk | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index 5f7d8a345..06186b5cc 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -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 diff --git a/net/openvswitch/openvswitch.mk b/net/openvswitch/openvswitch.mk index 71022a7f4..cf46f6be1 100644 --- a/net/openvswitch/openvswitch.mk +++ b/net/openvswitch/openvswitch.mk @@ -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 |