From 4e5eb5e0b92ea423868e60dfa90ca049a3669244 Mon Sep 17 00:00:00 2001
From: Matthew Hagan <mathagan@fb.com>
Date: Wed, 15 Dec 2021 14:53:29 +0000
Subject: openvswitch: merge dependency lists

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>
---
 net/openvswitch/Makefile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'net/openvswitch/Makefile')

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