Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

openvswitch: rename shared var name ovs{,_}_common_depends

Browse source 
To avoid conflict with package ovs_common_depends of package
openvswitch-common

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
This commit is contained in:
Yousong Zhou 2020-07-29 10:17:14 +08:00
parent acca35d460
commit f69f4f3fae
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/openvswitch/Makefile
View file

@ -156,7 +156,7 @@ ovs_kmod_openvswitch-lisp-intree_depends:= +kmod-openvswitch-intree
ovs_kmod_openvswitch-lisp-intree_files:= $(ovs_kmod_intree_dir)/vport-lisp.ko ovs_kmod_openvswitch-lisp-intree_files:= $(ovs_kmod_intree_dir)/vport-lisp.ko
$(eval $(call OvsKmodPackageTemplate,openvswitch-lisp-intree)) $(eval $(call OvsKmodPackageTemplate,openvswitch-lisp-intree))
ovs_common_depends:= +libatomic +libunbound +libunwind ovs__common_depends:= +libatomic +libunbound +libunwind
# Dependency review # Dependency review
# #

4
net/openvswitch/openvswitch.mk
View file

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

2
net/ovn/Makefile
View file

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