| commit | 12e3d60ffc692e6e79c4129a9daad45955bea54b | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Wed Oct 05 20:10:23 2016 -0400 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Wed Oct 12 03:14:42 2016 +0000 |
| tree | bf93b6dda8a2386cc93552c6e1e19946ab00b62c | |
| parent | 60cfb39a1ed41dc3764d2f23fa8cba200da719ce [diff] |
Rename obmc-mapper -> phosphor-mapper To meet naming conventions. Change-Id: I7ce975dca7c5371ff3fa503a75bbaadd8457d05b Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb index a13c632..ab41423 100644 --- a/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb +++ b/meta-phosphor/common/recipes-phosphor/chassis/obmc-op-control-power.bb
@@ -5,9 +5,7 @@ inherit skeleton-gdbus inherit obmc-phosphor-dbus-service -DEPENDS += "obmc-mapper systemd" - -DEPENDS += "obmc-mapper systemd" +DEPENDS += "phosphor-mapper systemd" SKELETON_DIR = "op-pwrctl"
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper.bb b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb similarity index 100% rename from meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper.bb rename to meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/mapper-wait@.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service similarity index 100% rename from meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/mapper-wait@.service rename to meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.conf b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/org.openbmc.ObjectMapper.conf similarity index 100% rename from meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.conf rename to meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/org.openbmc.ObjectMapper.conf
diff --git a/meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.service b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/org.openbmc.ObjectMapper.service similarity index 100% rename from meta-phosphor/common/recipes-phosphor/dbus/obmc-mapper/org.openbmc.ObjectMapper.service rename to meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper/org.openbmc.ObjectMapper.service
diff --git a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb index 13f6804..81290b6 100644 --- a/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb +++ b/meta-phosphor/common/recipes-phosphor/host-ipmid/host-ipmid.bb
@@ -11,9 +11,9 @@ TARGET_CFLAGS += "-fpic" -DEPENDS += "obmc-mapper" +DEPENDS += "phosphor-mapper" DEPENDS += "autoconf-archive-native" -RDEPENDS_${PN}-dev += "obmc-mapper-dev" +RDEPENDS_${PN}-dev += "phosphor-mapper-dev" RDEPENDS_${PN} += "clear-once" RDEPENDS_${PN} += "network" RDEPENDS_${PN} += "libmapper"
diff --git a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb index 8df4ca0..058e450 100644 --- a/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb +++ b/meta-phosphor/common/recipes-phosphor/interfaces/phosphor-rest.bb
@@ -15,7 +15,7 @@ RDEPENDS_${PN} += " \ python-xml \ python-dbus \ - obmc-mapper \ + phosphor-mapper \ python-bottle \ python-spwd \ pyphosphor-utils \