diff options
26 files changed, 56 insertions, 248 deletions
diff --git a/meta-google/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bbappend b/meta-google/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bbappend deleted file mode 100644 index 47e290b358..0000000000 --- a/meta-google/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -PHOSPHOR_MAPPER_SERVICE:append = " com.google.gbmc" -PHOSPHOR_MAPPER_INTERFACE:append = " com.google.gbmc" diff --git a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb b/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb deleted file mode 100644 index 14c125543d..0000000000 --- a/meta-ibm/recipes-phosphor/dbus/ibm-dbus-interfaces-mapper-config-native.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY="Add /com/ibm namespace to phosphor-mapper" -DESCRIPTION="Add the /com/ibm path namespace and \ -com.ibm interface prefix to the mapper watch list." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-mapper -inherit native - -PHOSPHOR_MAPPER_SERVICE:append = " com.ibm" -PHOSPHOR_MAPPER_INTERFACE:append = " com.ibm" diff --git a/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend b/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend deleted file mode 100644 index 25ab376fbb..0000000000 --- a/meta-ibm/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -PHOSPHOR_MAPPER_CONFIGS:append = " ibm-dbus-interfaces-mapper-config-native" diff --git a/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb deleted file mode 100644 index 625a81921f..0000000000 --- a/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/intel-dbus-interfaces-mapper-config-native.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY="Add /com/intel namespace to phosphor-mapper" -DESCRIPTION="Add the /com/intel path namespace and \ -com.intel interface prefix to the mapper watch list." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-mapper -inherit native - -PHOSPHOR_MAPPER_SERVICE:append = " com.intel" -PHOSPHOR_MAPPER_INTERFACE:append = " com.intel" diff --git a/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend b/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend deleted file mode 100644 index 50f276aa6e..0000000000 --- a/meta-intel-openbmc/meta-common/recipes-phosphor/dbus/phosphor-mapper-config-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -PHOSPHOR_MAPPER_CONFIGS:append:intel = " intel-dbus-interfaces-mapper-config-native" diff --git a/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb b/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb deleted file mode 100644 index 67b09ea5c1..0000000000 --- a/meta-openpower/recipes-phosphor/dbus/openpower-dbus-interfaces-mapper-config-native.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY="Add /org/open_power namespace to phosphor-mapper" -DESCRIPTION="Add the /org/open_power path namespace and \ -org.open_power interface prefix to the mapper \ -watch list." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-mapper -inherit native - -PHOSPHOR_MAPPER_SERVICE:append = " org.open_power" -PHOSPHOR_MAPPER_INTERFACE:append = " org.open_power" diff --git a/meta-openpower/recipes-phosphor/dbus/phosphor-mapper-config-native%.bbappend b/meta-openpower/recipes-phosphor/dbus/phosphor-mapper-config-native%.bbappend deleted file mode 100644 index 4eb20e8123..0000000000 --- a/meta-openpower/recipes-phosphor/dbus/phosphor-mapper-config-native%.bbappend +++ /dev/null @@ -1 +0,0 @@ -PHOSPHOR_MAPPER_CONFIGS:append:df-openpower = " openpower-dbus-interfaces-mapper-config-native" diff --git a/meta-phosphor/classes/phosphor-mapper.bbclass b/meta-phosphor/classes/phosphor-mapper.bbclass deleted file mode 100644 index 1ee95d7735..0000000000 --- a/meta-phosphor/classes/phosphor-mapper.bbclass +++ /dev/null @@ -1,47 +0,0 @@ -# Common code for recipes that modify the phosphor-mapper -# configuration. -# -# Typically it is not desired to monitor all dbus traffic -# on a system and as such, the phosphor-mapper has command -# line options to control what path namespaces and dbus -# interfaces it will keep track of. -# -# The Phosphor layer by default configures the mapper to -# watch xyz.openbmc_project services and interfaces only. -# This configuration file is intended to be inherited by -# native recipes in other layers that wish to add namespaces -# or interfaces to the mapper watchlist. - -# Add service namespaces to be monitored: -# PHOSPHOR_MAPPER_SERVICE:append = " foo.bar" - -# Add interfaces to be monitored: -# PHOSPHOR_MAPPER_INTERFACE:append = " foo.bar" - -# Blacklist services from being monitored: -# PHOSPHOR_MAPPER_SERVICE_BLACKLIST:append = " foo.bar" - -inherit phosphor-mapperdir -inherit obmc-phosphor-utils - -python phosphor_mapper_do_postinst() { - def process_var(d, var, dir): - for p in listvar_to_list(d, var): - parent = d.getVar('D', True) + d.getVar(dir, True) - if not os.path.exists(parent): - os.makedirs(parent) - path = os.path.join( - parent, - '-'.join(p.split(os.sep))) - with open(path, 'w+') as fd: - pass - - process_var(d, 'PHOSPHOR_MAPPER_SERVICE', 'service_dir') - process_var(d, 'PHOSPHOR_MAPPER_INTERFACE', 'interface_dir') - process_var(d, 'PHOSPHOR_MAPPER_SERVICE_BLACKLIST', 'serviceblacklist_dir') -} - -do_install[vardeps] += "PHOSPHOR_MAPPER_SERVICE" -do_install[vardeps] += "PHOSPHOR_MAPPER_INTERFACE" -do_install[vardeps] += "PHOSPHOR_MAPPER_SERVICE_BLACKLIST" -do_install[postfuncs] += "phosphor_mapper_do_postinst" diff --git a/meta-phosphor/classes/phosphor-mapperdir.bbclass b/meta-phosphor/classes/phosphor-mapperdir.bbclass deleted file mode 100644 index 4b6bc62b4f..0000000000 --- a/meta-phosphor/classes/phosphor-mapperdir.bbclass +++ /dev/null @@ -1,3 +0,0 @@ -service_dir="${datadir}/phosphor-mapper/service" -interface_dir="${datadir}/phosphor-mapper/interface" -serviceblacklist_dir="${datadir}/phosphor-mapper/serviceblacklist" diff --git a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb index 4d8fb37ba1..1a65a11b67 100644 --- a/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb +++ b/meta-phosphor/recipes-phosphor/chassis/obmc-op-control-power_git.bb @@ -7,7 +7,7 @@ inherit skeleton-gdbus inherit obmc-phosphor-dbus-service inherit pkgconfig -DEPENDS += "phosphor-mapper systemd" +DEPENDS += "libmapper systemd" SKELETON_DIR = "op-pwrctl" 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 ce66037577..22177ae482 100644 --- a/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb +++ b/meta-phosphor/recipes-phosphor/datetime/phosphor-time-manager_git.bb @@ -4,7 +4,6 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-time-manager" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" DEPENDS += "autoconf-archive-native" -DEPENDS += "phosphor-mapper" DEPENDS += "systemd" DEPENDS += "sdbusplus" DEPENDS += "${PYTHON_PN}-sdbus++-native" @@ -23,6 +22,6 @@ inherit obmc-phosphor-dbus-service RDEPENDS:${PN} += "phosphor-settings-manager" RDEPENDS:${PN} += "phosphor-network" -RDEPENDS:${PN} += "phosphor-mapper" +RDEPENDS:${PN} += "phosphor-objmgr" DBUS_SERVICE:${PN} += "xyz.openbmc_project.Time.Manager.service" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb deleted file mode 100644 index 22e2ee3f91..0000000000 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces-mapper-config-native.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Add xyz.openbmc_project namespace to phosphor-mapper" -DESCRIPTION = "Add the xyz.openbmc_project service namespace and \ -xyz.openbmc_project interface prefix to the mapper \ -watch list." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-mapper -inherit native - -PHOSPHOR_MAPPER_SERVICE:append = " xyz.openbmc_project" -PHOSPHOR_MAPPER_INTERFACE:append = " xyz.openbmc_project org.freedesktop.DBus.ObjectManager" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb deleted file mode 100644 index c74144b48c..0000000000 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-legacy-namespace-mapper-config-native.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "Add org.openbmc namespace to phosphor-mapper" -DESCRIPTION = "Add the legacy org.openbmc service namespace and \ -org.openbmc interface prefix to the mapper watch list." -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit phosphor-mapper -inherit native - -PHOSPHOR_MAPPER_SERVICE:append = " org.openbmc" -PHOSPHOR_MAPPER_INTERFACE:append = " org.openbmc" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb deleted file mode 100644 index 1ee9b86254..0000000000 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper-config-native.bb +++ /dev/null @@ -1,33 +0,0 @@ -# To add namespaces and blacklists to the mapper configuration, -# create a native recipe in your layer, and add it to -# PHOSPHOR_MAPPER_CONFIGS with a bbappend to this recipe. -# Recipes should set one of the variables below. -# Consult phosphor-mapper.bbclass for additional information. -SUMMARY = "Phosphor Mapper Configuration" -DESCRIPTION = "Meta-recipe, pulling in native recipes that wish to add \ -configuration files to the native /usr/share/phosphor-mapper filesystem." -HOMEPAGE = "http://github.com/openbmc/phosphor-objmgr" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -DEPENDS += "${PHOSPHOR_MAPPER_CONFIGS}" -PR = "r1" - -inherit phosphor-mapper -inherit native - -do_install() { - install -d ${D}/${namespace_dir} - install -d ${D}/${interface_dir} - install -d ${D}/${serviceblacklist_dir} -} - -PHOSPHOR_MAPPER_CONFIGS = " \ - phosphor-dbus-interfaces-mapper-config-native \ - phosphor-legacy-namespace-mapper-config-native \ - " -# Add services to be monitored. -PHOSPHOR_MAPPER_SERVICE = "" -# Add interfaces to be monitored. -PHOSPHOR_MAPPER_INTERFACE = "" -# Blacklist services from being monitored. -PHOSPHOR_MAPPER_SERVICE_BLACKLIST = "" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service deleted file mode 100644 index d57ec31299..0000000000 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Phosphor DBus Service Discovery Manager -Before=obmc-mapper.target -After=dbus.service - -[Service] -Restart=always -Type=dbus -ExecStart=/usr/bin/mapperx \ - --service-namespaces="${{MAPPER_SERVICES}}" \ - --interface-namespaces="${{MAPPER_INTERFACES}}" \ - --service-blacklists="${{MAPPER_SERVICEBLACKLISTS}}" -BusName={BUSNAME} -TimeoutStartSec=300 -RestartSec=5 -EnvironmentFile={envfiledir}/obmc/mapper - -[Install] -WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb deleted file mode 100644 index a7905f0b6d..0000000000 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb +++ /dev/null @@ -1,76 +0,0 @@ -SUMMARY = "Phosphor DBUS Object Manager" -DESCRIPTION = "Phosphor DBUS object manager." -HOMEPAGE = "http://github.com/openbmc/phosphor-objmgr" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" -DEPENDS += "systemd" -DEPENDS += "boost" -DEPENDS += "libtinyxml2" -DEPENDS += "sdbusplus" -DEPENDS += "phosphor-logging" -DEPENDS += "${PN}-config-native" -DEPENDS += "cli11" -SRCREV = "8c243629a9e6866ccac247d74f274b86bc1fad50" -PV = "1.0+git${SRCPV}" -PR = "r1" - -SRC_URI += "git://github.com/openbmc/phosphor-objmgr;branch=master;protocol=https" - -SYSTEMD_SERVICE:${PN} += " \ - mapper-wait@.service \ - mapper-subtree-remove@.service \ - " -S = "${WORKDIR}/git" - -inherit meson pkgconfig -inherit obmc-phosphor-dbus-service -inherit obmc-phosphor-systemd -inherit phosphor-mapperdir - -EXTRA_OEMESON += "-Dtests=disabled" - -do_install[postfuncs] += "do_emit_env" - -PACKAGES_DYNAMIC += "^libmapper.*" - -FILES:${PN}:remove = "${libdir}/lib*.so.* ${libdir}/*" - -python populate_packages:prepend () { - mapperlibdir = d.getVar("libdir", True) - do_split_packages(d, mapperlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Phosphor mapper %s library', extra_depends='', allow_links=True) -} -# Construct a systemd environment file with mapper commandline -# from the native sysroot /usr/share/phosphor-mapper filesystem. -python do_emit_env() { - path = d.getVar('STAGING_DIR_NATIVE', True) + \ - d.getVar('service_dir', True) - services = [] - for s in os.listdir(path): - services.append('.'.join(s.split('-'))) - path = d.getVar('STAGING_DIR_NATIVE', True) + \ - d.getVar('interface_dir', True) - interfaces = [] - for i in os.listdir(path): - interfaces.append('.'.join(i.split('-'))) - path = d.getVar('STAGING_DIR_NATIVE', True) + \ - d.getVar('serviceblacklist_dir', True) - service_blacklists = [] - for x in os.listdir(path): - service_blacklists.append('.'.join(x.split('-'))) - path = [d.getVar('D', True) + d.getVar('envfiledir', True)] - path.append('obmc') - path.append('mapper') - parent = os.path.join(*path[:-1]) - path = os.path.join(*path) - if not os.path.exists(parent): - os.makedirs(parent) - with open(path, 'w+') as fd: - fd.write('MAPPER_SERVICES="{}"'.format(' '.join(services))) - fd.write('\n') - fd.write('MAPPER_INTERFACES="{}"'.format(' '.join(interfaces))) - fd.write('\n') - fd.write('MAPPER_SERVICEBLACKLISTS="{}"'.format(' '.join(service_blacklists))) - fd.write('\n') -} - -DBUS_SERVICE:${PN} += "xyz.openbmc_project.ObjectMapper.service" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/mapper-subtree-remove@.service index 835c947bbe..835c947bbe 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-subtree-remove@.service +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/mapper-subtree-remove@.service diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/mapper-wait@.service index 06e2e46509..06e2e46509 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/mapper-wait@.service +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/mapper-wait@.service diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.conf b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/xyz.openbmc_project.ObjectMapper.conf index 3d9fcc3271..3d9fcc3271 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper/xyz.openbmc_project.ObjectMapper.conf +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/xyz.openbmc_project.ObjectMapper.conf diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/xyz.openbmc_project.ObjectMapper.service b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/xyz.openbmc_project.ObjectMapper.service new file mode 100644 index 0000000000..f00c6fad5e --- /dev/null +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr/xyz.openbmc_project.ObjectMapper.service @@ -0,0 +1,15 @@ +[Unit] +Description=Phosphor DBus Service Discovery Manager +Before=obmc-mapper.target +After=dbus.service + +[Service] +Restart=always +Type=dbus +ExecStart=/usr/bin/mapperx +BusName={BUSNAME} +TimeoutStartSec=300 +RestartSec=5 + +[Install] +WantedBy=multi-user.target diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb new file mode 100644 index 0000000000..cd2fd2a805 --- /dev/null +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-objmgr_git.bb @@ -0,0 +1,34 @@ +SUMMARY = "Phosphor DBUS Object Manager" +DESCRIPTION = "Phosphor DBUS object manager." +HOMEPAGE = "http://github.com/openbmc/phosphor-objmgr" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" +DEPENDS += "systemd" +DEPENDS += "boost" +DEPENDS += "libtinyxml2" +DEPENDS += "sdbusplus" +DEPENDS += "phosphor-logging" +DEPENDS += "cli11" +SRCREV = "8c243629a9e6866ccac247d74f274b86bc1fad50" +PV = "1.0+git${SRCPV}" +PR = "r1" + +SRC_URI += "git://github.com/openbmc/phosphor-objmgr;branch=master;protocol=https" + +SYSTEMD_SERVICE:${PN} += " \ + mapper-wait@.service \ + mapper-subtree-remove@.service \ + " +S = "${WORKDIR}/git" + +inherit meson pkgconfig +inherit obmc-phosphor-dbus-service +inherit obmc-phosphor-systemd + +EXTRA_OEMESON += "-Dtests=disabled" + +PROVIDES += "libmapper" +PACKAGE_BEFORE_PN += "libmapper" +FILES:libmapper = "${libdir}/lib*.so*" + +DBUS_SERVICE:${PN} += "xyz.openbmc_project.ObjectMapper.service" diff --git a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb index 06097bb2eb..2594a37f75 100644 --- a/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb +++ b/meta-phosphor/recipes-phosphor/interfaces/bmcweb_git.bb @@ -41,7 +41,7 @@ do_install_ptest() { RDEPENDS:${PN} += " \ jsnbd \ - phosphor-mapper \ + phosphor-objmgr \ " FILES:${PN} += "${datadir}/** " diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb index 7ac14d0df1..0e68e96f70 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-fru_git.bb @@ -8,7 +8,7 @@ DEPENDS += " \ ${PYTHON_PN}-mako-native \ ${PYTHON_PN}-pyyaml-native \ phosphor-ipmi-host \ - phosphor-mapper \ + libmapper \ autoconf-archive-native \ phosphor-logging \ cli11 \ 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 392226088a..6794a09c30 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-host_git.bb @@ -41,7 +41,7 @@ DEPENDS += "phosphor-state-manager" DEPENDS += "${@ipmi_whitelists(d)}" DEPENDS += "phosphor-dbus-interfaces" DEPENDS += "phosphor-logging" -DEPENDS += "phosphor-mapper" +DEPENDS += "libmapper" DEPENDS += "sdbusplus" DEPENDS += "${PYTHON_PN}-sdbus++-native" DEPENDS += "virtual/phosphor-ipmi-inventory-sel" diff --git a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb index 2a63b8737e..95add077c6 100644 --- a/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb +++ b/meta-phosphor/recipes-phosphor/ipmi/phosphor-ipmi-net_git.bb @@ -15,7 +15,7 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-net-ipmid" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" DEPENDS += "cli11" -DEPENDS += "phosphor-mapper" +DEPENDS += "libmapper" DEPENDS += "systemd" DEPENDS += "phosphor-ipmi-host" SRCREV = "67aaec2e06ff9c2bfd5900b9f07834fca9d009f2" diff --git a/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend b/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend index 6617917ba3..9e33b94339 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend +++ b/meta-yadro/meta-nicole/recipes-phosphor/cli/obmc-yadro-cli_%.bbappend @@ -5,6 +5,6 @@ RDEPENDS:${PN}:append = " \ openpower-esel-parser \ phosphor-debug-collector \ phosphor-led-manager \ - phosphor-mapper \ + phosphor-objmgr \ phosphor-state-manager \ " |