meta-phosphor: point recipes to depend on phosphor-network
Point various meta-phosphor recipes to depend on phosphor-network
instead of network. Also, update the default for this feature to be
phosphor-network instead of network.
(From meta-phosphor rev: 98fa96164889d0eed896a731bcfb348d5d802bef)
Tested: Verified meta-ibm/meta-witherspoon built.
Change-Id: I1c4b8fdcb92bf216e50d9f88273a7ac7bdc20213
Signed-off-by: Patrick Venture <venture@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index f1bc7ea..b36181c 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -119,7 +119,7 @@
# obmc-network-manager
#
# Provide support for managing network
-VIRTUAL-RUNTIME_obmc-network-manager ?= "network"
+VIRTUAL-RUNTIME_obmc-network-manager ?= "phosphor-network"
# Configuration overrides for phosphor-ipmi-fru.
#
diff --git a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb
index a2b34fa..4a801db 100644
--- a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb
@@ -16,7 +16,7 @@
DEPENDS += "phosphor-logging"
DEPENDS += "phosphor-dbus-interfaces"
RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_obmc-settings-mgmt}"
-RDEPENDS_${PN} += "network"
+RDEPENDS_${PN} += "phosphor-network"
RDEPENDS_${PN} += "phosphor-mapper"
SRC_URI += "git://github.com/openbmc/phosphor-time-manager"
diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
index 9527b39..9d61a29 100644
--- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
+++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb
@@ -42,7 +42,7 @@
RDEPENDS_${PN}-dev += "phosphor-logging"
RDEPENDS_${PN}-dev += "phosphor-mapper-dev"
RDEPENDS_${PN} += "clear-once"
-RDEPENDS_${PN} += "network"
+RDEPENDS_${PN} += "phosphor-network"
RDEPENDS_${PN} += "phosphor-time-manager"
RDEPENDS_${PN} += "${VIRTUAL-RUNTIME_ipmi-config}"
RDEPENDS_${PN} += "virtual/obmc-watchdog"
diff --git a/meta-phosphor/recipes-phosphor/network/inarp_git.bb b/meta-phosphor/recipes-phosphor/network/inarp_git.bb
index e32a264..b03ef5e 100644
--- a/meta-phosphor/recipes-phosphor/network/inarp_git.bb
+++ b/meta-phosphor/recipes-phosphor/network/inarp_git.bb
@@ -10,7 +10,7 @@
inherit obmc-phosphor-systemd
DEPENDS += "autoconf-archive-native"
-RDEPENDS_${PN} += "network"
+RDEPENDS_${PN} += "phosphor-network"
SRC_URI += "git://github.com/openbmc/inarp"
SRCREV = "6d579909fc8e623e8a0dd6d4a32a4aee725c32f7"