From b417d47462cfc158c3f84f4c6816068e63491ee6 Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Wed, 12 Jun 2019 13:33:25 -0500 Subject: meta-phosphor: Enable phosphor-dbus-monitor non-native recipes Switch phosphor-dbus-monitor from a native to a non-native recipe. This allows for machine overrides in order to consume the correct policy configuration files as input from within a system layer. Tested: Built witherspoon phosphor-dbus-monitor resulting in no image change (From meta-phosphor rev: 71f907f175b511bad3f91299ad0989baf3d734c4) Change-Id: I8f7ec96af6f1ffbec4edc7ee3c70423850665b2d Signed-off-by: Matthew Barth Signed-off-by: Brad Bishop --- .../dbus/phosphor-dbus-monitor-config-native.bb | 21 --------------------- .../dbus/phosphor-dbus-monitor_git.bb | 4 ++-- 2 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb (limited to 'meta-phosphor/recipes-phosphor') diff --git a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb deleted file mode 100644 index 80954f61f..000000000 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor-config-native.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Phosphor DBus Monitor Configuration" -DESCRIPTION = "Meta-recipe, pulling in native recipes that wish to add \ -configuration files to the /usr/share/phosphor-dbus-monitor filesystem." -HOMEPAGE = "http://github.com/openbmc/phosphor-dbus-monitor" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit native -inherit phosphor-dbus-monitor - -PHOSPHOR_DBUS_MONITOR_CONFIGS ??= "" - -# To add additional config files, create a recipe in your layer, -# and add it to PHOSPHOR_DBUS_MONITOR_CONFIGS with a bbappend to this recipe. - -DEPENDS += "${PHOSPHOR_DBUS_MONITOR_CONFIGS}" - -do_install() { - mkdir -p ${D}${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 463bd8364..ae2274369 100644 --- a/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb +++ b/meta-phosphor/recipes-phosphor/dbus/phosphor-dbus-monitor_git.bb @@ -20,7 +20,7 @@ SYSTEMD_PACKAGES = "${PN} phosphor-msl-verify" SYSTEMD_SERVICE_phosphor-msl-verify = "phosphor-msl-verify.service" DEPENDS += " \ - ${PN}-config-native \ + ${PN}-config \ phosphor-logging \ autoconf-archive-native \ sdbusplus-native \ @@ -34,5 +34,5 @@ FILES_phosphor-msl-verify = "${bindir}/phosphor-msl-verify" S = "${WORKDIR}/git" EXTRA_OECONF = " \ - YAML_PATH=${STAGING_DIR_NATIVE}${config_dir} \ + YAML_PATH=${STAGING_DIR_HOST}${config_dir} \ " -- cgit v1.2.3