diff options
Diffstat (limited to 'meta-phosphor/recipes-phosphor/dbus')
7 files changed, 14 insertions, 14 deletions
diff --git a/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb b/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb index b194740d3..ca60b6931 100644 --- a/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb +++ b/meta-phosphor/recipes-phosphor/dbus/dbus-perms.bb @@ -10,7 +10,7 @@ inherit dbus-dir SRC_URI += "file://org.openbmc.conf" -do_install_append() { +do_install:append() { install -d ${D}${dbus_system_confdir} install -m 0644 ${WORKDIR}/org.openbmc.conf \ ${D}${dbus_system_confdir} 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 index 3dfc3b1a6..dda33fa99 100644 --- 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 @@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit phosphor-mapper inherit native -PHOSPHOR_MAPPER_SERVICE_append = " xyz.openbmc_project" -PHOSPHOR_MAPPER_INTERFACE_append = " xyz.openbmc_project org.freedesktop.DBus.ObjectManager" +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-dbus-interfaces_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb index 98a5c7881..763586ec5 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-interfaces_git.bb @@ -31,8 +31,8 @@ pdi_meson_config[vardeps] = "OBMC_ORG_YAML_SUBDIRS" # Markdown files are installed into /usr/share/phosphor-dbus-interfaces so # add them to the 'doc' subpackage. -FILES_${PN}-doc += "${datadir}/${BPN}" +FILES:${PN}-doc += "${datadir}/${BPN}" -EXTRA_OEMESON_append = " \ +EXTRA_OEMESON:append = " \ -Db_lto=true \ ${@pdi_meson_config(d)}" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bb index d1de054be..dddf9c04c 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config.bb @@ -19,4 +19,4 @@ do_install() { mkdir -p ${D}${config_dir} } -FILES_${PN} += "${config_dir}" +FILES:${PN} += "${config_dir}" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb index cc0b5c631..136a03e41 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb @@ -17,7 +17,7 @@ inherit autotools \ PACKAGE_BEFORE_PN = "phosphor-msl-verify" SYSTEMD_PACKAGES = "${PN} phosphor-msl-verify" -SYSTEMD_SERVICE_phosphor-msl-verify = "phosphor-msl-verify.service" +SYSTEMD_SERVICE:phosphor-msl-verify = "phosphor-msl-verify.service" DEPENDS += " \ ${PN}-config \ @@ -33,7 +33,7 @@ DEPENDS += " \ ${PYTHON_PN}-mako-native \ " -FILES_phosphor-msl-verify = "${bindir}/phosphor-msl-verify" +FILES:phosphor-msl-verify = "${bindir}/phosphor-msl-verify" S = "${WORKDIR}/git" 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 index c92351214..2682ba37c 100644 --- 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 @@ -8,5 +8,5 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit phosphor-mapper inherit native -PHOSPHOR_MAPPER_SERVICE_append = " org.openbmc" -PHOSPHOR_MAPPER_INTERFACE_append = " org.openbmc" +PHOSPHOR_MAPPER_SERVICE:append = " org.openbmc" +PHOSPHOR_MAPPER_INTERFACE:append = " org.openbmc" diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb index d5e919812..39ea10d16 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-mapper_git.bb @@ -19,8 +19,8 @@ DEPENDS += "sdbusplus" DEPENDS += "phosphor-logging" DEPENDS += "${PN}-config-native" -DBUS_SERVICE_${PN} += "xyz.openbmc_project.ObjectMapper.service" -SYSTEMD_SERVICE_${PN} += " \ +DBUS_SERVICE:${PN} += "xyz.openbmc_project.ObjectMapper.service" +SYSTEMD_SERVICE:${PN} += " \ mapper-wait@.service \ mapper-subtree-remove@.service \ " @@ -32,12 +32,12 @@ S = "${WORKDIR}/git" EXTRA_OECONF += "--disable-tests" -python populate_packages_prepend () { +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) } PACKAGES_DYNAMIC += "^libmapper.*" -FILES_${PN}_remove = "${libdir}/lib*.so.* ${libdir}/*" +FILES:${PN}:remove = "${libdir}/lib*.so.* ${libdir}/*" # Construct a systemd environment file with mapper commandline # from the native sysroot /usr/share/phosphor-mapper filesystem. |