diff options
3 files changed, 7 insertions, 3 deletions
diff --git a/meta-phosphor/classes/phosphor-inventory-manager.bbclass b/meta-phosphor/classes/phosphor-inventory-manager.bbclass new file mode 100644 index 0000000000..01fa37262b --- /dev/null +++ b/meta-phosphor/classes/phosphor-inventory-manager.bbclass @@ -0,0 +1,2 @@ +base_datadir="${datadir}/phosphor-inventory-manager" +rules_datadir="${base_datadir}/events.d" diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-config-example-native.bb b/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-config-example-native.bb index 880d5ac9bf..e59bc881a1 100644 --- a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-config-example-native.bb +++ b/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager-config-example-native.bb @@ -2,6 +2,7 @@ SUMMARY = "Managed inventory with Phosphor inventory manager - example" PR = "r1" inherit native +inherit phosphor-inventory-manager require phosphor-inventory-manager.inc @@ -9,9 +10,9 @@ S = "${WORKDIR}/git" do_install() { SRC=${S}/example - DEST=${D}${datadir}/phosphor-inventory-manager + DEST=${D}${base_datadir} for f in `find $SRC -type f -printf "%P\n"`; do - install -D ${SRC}/$f $DEST/$f + install -D ${SRC}/$f ${DEST}/$f done } diff --git a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.bb b/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.bb index fda1d53cb9..3d1dacf199 100644 --- a/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.bb +++ b/meta-phosphor/common/recipes-phosphor/inventory/phosphor-inventory-manager.bb @@ -7,6 +7,7 @@ PR = "r1" inherit autotools \ pkgconfig \ pythonnative \ + phosphor-inventory-manager \ obmc-phosphor-dbus-service require phosphor-inventory-manager.inc @@ -27,7 +28,7 @@ DBUS_SERVICE_${PN} = "${OBMC_INVENTORY_MGR_IFACE}.service" S = "${WORKDIR}/git" EXTRA_OECONF = " \ - YAML_PATH=${STAGING_DATADIR_NATIVE}/${PN} \ + YAML_PATH=${STAGING_DIR_NATIVE}${base_datadir} \ BUSNAME=${OBMC_INVENTORY_MGR_IFACE} \ INVENTORY_ROOT=${OBMC_INVENTORY_PATH} \ IFACE=${OBMC_INVENTORY_MGR_IFACE} \ |