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

To avoid conflict with package ovs_common_depends of package
openvswitch-common

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile
index 2a9f34227ef4aff00cfe8167a5d7dd515fe22e8c..74a0ae22c11963d56582400d1361570dd48d5f97 100644 (file)
--- a/net/openvswitch/Makefile
+++ b/net/openvswitch/Makefile
@@ -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
 $(eval $(call OvsKmodPackageTemplate,openvswitch-lisp-intree))
 
-ovs_common_depends:= +libatomic +libunbound +libunwind
+ovs__common_depends:= +libatomic +libunbound +libunwind
 
 # Dependency review
 #

diff --git a/net/openvswitch/openvswitch.mk b/net/openvswitch/openvswitch.mk
index cf46f6be1dd7a7521a605406d2006bf85ec28731..78d35c031f37e5aa208396738f2fc652a45eac63 100644 (file)
--- a/net/openvswitch/openvswitch.mk
+++ b/net/openvswitch/openvswitch.mk
@@ -10,7 +10,7 @@ ovs_builddir=$(KERNEL_BUILD_DIR)/openvswitch-$(ovs_version)
 
 # Shared vars, macros
 
-ovs_common_depends:=
+ovs__common_depends:=
 ovs_packages:=
 
 ovs_package_name=$(if $(filter openvswitch,$(1)),openvswitch,openvswitch-$(1))
@@ -22,7 +22,7 @@ define OvsPackageTemplate
      URL:=https://www.openvswitch.org
      TITLE:=$(ovs_$(1)_title)
      HIDDEN:=$(ovs_$(1)_hidden)
-     DEPENDS:=$(ovs_$(1)_depends) $(ovs_common_depends)
+     DEPENDS:=$(ovs_$(1)_depends) $(ovs__common_depends)
   endef
 
   define Package/$(call ovs_package_name,$(1))/install

diff --git a/net/ovn/Makefile b/net/ovn/Makefile
index 252158fc03ce25801deef67ff0e5311ae43fe40f..fa7ed552d1933db3b5e030ed7137d23c452d0946 100644 (file)
--- a/net/ovn/Makefile
+++ b/net/ovn/Makefile
@@ -33,7 +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__common_depends:= +libatomic +libunbound
 
 ovs_libovn_title:=Open vSwitch (libovn.so)
 ovs_libovn_hidden:=1