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

openvswitch: merge dependency lists

Browse source 
Rather than defining dependencies, then appending the libatomic
dependency on the following line, merge all into one definition.
Simultaneously, sort by alphabetical order.

Signed-off-by: Matthew Hagan <mathagan@fb.com>
This commit is contained in:
Matthew Hagan 2021-12-15 14:53:29 +00:00 committed by Yousong Zhou
parent 0571f5400d
commit 4e5eb5e0b9
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
net/openvswitch/Makefile
View file

@ -153,8 +153,7 @@ $(eval $(call OvsKmodPackageTemplate,openvswitch-lisp-intree))
# #
ovs_libopenvswitch_title:=Open vSwitch (libopenvswitch.so) ovs_libopenvswitch_title:=Open vSwitch (libopenvswitch.so)
ovs_libopenvswitch_hidden:=1 ovs_libopenvswitch_hidden:=1
ovs_libopenvswitch_depends:=+libopenssl +!(arc||arceb):libunwind ovs_libopenvswitch_depends:= +libatomic +libopenssl +!(arc||arceb):libunwind
ovs_libopenvswitch_depends+=+libatomic
ifeq ($(CONFIG_OPENVSWITCH_WITH_LIBUNBOUND),y) ifeq ($(CONFIG_OPENVSWITCH_WITH_LIBUNBOUND),y)
ovs_libopenvswitch_depends+=+libunbound ovs_libopenvswitch_depends+=+libunbound
endif endif
@ -178,24 +177,25 @@ $(eval $(call OvsPackageTemplate,libovsdb))
ovs_vswitchd_title:=Open vSwitch (ovs-vswitchd) ovs_vswitchd_title:=Open vSwitch (ovs-vswitchd)
ovs_vswitchd_hidden:=1 ovs_vswitchd_hidden:=1
ovs_vswitchd_depends:=+openvswitch-libopenvswitch +openvswitch-libofproto ovs_vswitchd_depends:= \
ovs_vswitchd_depends+=+libatomic +libatomic +openvswitch-libofproto +openvswitch-libopenvswitch
ovs_vswitchd_files:=usr/sbin/ovs-vswitchd ovs_vswitchd_files:=usr/sbin/ovs-vswitchd
$(eval $(call OvsPackageTemplate,vswitchd)) $(eval $(call OvsPackageTemplate,vswitchd))
ovs_ovsdb_title:=Open vSwitch (ovsdb-server) ovs_ovsdb_title:=Open vSwitch (ovsdb-server)
ovs_ovsdb_hidden:=1 ovs_ovsdb_hidden:=1
ovs_ovsdb_depends:=+openvswitch-libopenvswitch +openvswitch-libovsdb ovs_ovsdb_depends:= \
ovs_ovsdb_depends+=+libatomic +libatomic +openvswitch-libopenvswitch +openvswitch-libovsdb
ovs_ovsdb_files:=usr/sbin/ovsdb-server ovs_ovsdb_files:=usr/sbin/ovsdb-server
$(eval $(call OvsPackageTemplate,ovsdb)) $(eval $(call OvsPackageTemplate,ovsdb))
ovs_common_title:=Open vSwitch (common files) ovs_common_title:=Open vSwitch (common files)
ovs_common_hidden:=1 ovs_common_hidden:=1
ovs_common_depends:=+openvswitch-libopenvswitch +openvswitch-libofproto +openvswitch-libovsdb ovs_common_depends:= \
ovs_common_depends+=+libatomic +libatomic +openvswitch-libofproto +openvswitch-libopenvswitch \
+openvswitch-libovsdb
ovs_common_files:= \ ovs_common_files:= \
usr/share/openvswitch/scripts/ovs-lib \ usr/share/openvswitch/scripts/ovs-lib \
usr/share/openvswitch/scripts/ovs-ctl \ usr/share/openvswitch/scripts/ovs-ctl \
@ -225,9 +225,9 @@ $(eval $(call OvsPackageTemplate,common))
# uuidgen is required for generating system-id # uuidgen is required for generating system-id
ovs_openvswitch_title:=Open vSwitch ovs_openvswitch_title:=Open vSwitch
ovs_openvswitch_hidden:= ovs_openvswitch_hidden:=
ovs_openvswitch_depends:=+coreutils +coreutils-sleep +uuidgen \ ovs_openvswitch_depends:= \
+openvswitch-common +openvswitch-vswitchd +openvswitch-ovsdb +kmod-openvswitch +coreutils +coreutils-sleep +kmod-openvswitch +libatomic +openvswitch-common \
ovs_openvswitch_depends+=+libatomic +openvswitch-ovsdb +openvswitch-vswitchd +uuidgen
ovs_openvswitch_files:= usr/share/openvswitch/vswitch.ovsschema ovs_openvswitch_files:= usr/share/openvswitch/vswitch.ovsschema
$(eval $(call OvsPackageTemplate,openvswitch)) $(eval $(call OvsPackageTemplate,openvswitch))