diff options
| author | Patrick Venture <venture@google.com> | 2019-03-28 19:09:13 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-03-28 23:39:04 +0300 |
| commit | 0995aac971440fbd434d0d9032ce4191f3f1c9a4 (patch) | |
| tree | c8b3b1825dd910097f82053062dc44468b678ae3 | |
| parent | f66e7d2a76f2060d4d7cc9dbe44c8a4718d7dacd (diff) | |
| download | openbmc-0995aac971440fbd434d0d9032ce4191f3f1c9a4.tar.xz | |
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>
4 files changed, 4 insertions, 4 deletions
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc index f1bc7ea27..b36181c06 100644 --- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc +++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc @@ -119,7 +119,7 @@ VIRTUAL-RUNTIME_obmc-settings-mgmt ?= "phosphor-settings-manager" # 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 a2b34fab7..4a801db8d 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 += "sdbusplus-native" 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 9527b39e0..9d61a290f 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 @@ VIRTUAL-RUNTIME_ipmi-config ?= "phosphor-ipmi-config" 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 e32a26408..b03ef5ec9 100644 --- a/meta-phosphor/recipes-phosphor/network/inarp_git.bb +++ b/meta-phosphor/recipes-phosphor/network/inarp_git.bb @@ -10,7 +10,7 @@ inherit autotools inherit obmc-phosphor-systemd DEPENDS += "autoconf-archive-native" -RDEPENDS_${PN} += "network" +RDEPENDS_${PN} += "phosphor-network" SRC_URI += "git://github.com/openbmc/inarp" SRCREV = "6d579909fc8e623e8a0dd6d4a32a4aee725c32f7" |