diff options
| author | Ratan Gupta <ratagupt@in.ibm.com> | 2017-09-13 18:18:23 +0530 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2017-10-04 21:07:27 +0000 |
| commit | d0184773cbcc2efd2e505470d02f9d3c8ec8ccb7 (patch) | |
| tree | b72e07f88ab5f720ed6a8e7587a25af009c18bd7 /meta-openbmc-machines | |
| parent | a5456ec5237f8f91a7785751fa3465d0a55f0743 (diff) | |
| download | talos-openbmc-d0184773cbcc2efd2e505470d02f9d3c8ec8ccb7.tar.gz talos-openbmc-d0184773cbcc2efd2e505470d02f9d3c8ec8ccb7.zip | |
Inventory: Make changes for sync inventory for witherspoon
Add the environment file for witherspoon
Resolves openbmc/openbmc#2361
Change-Id: Id2aabb9e4c484e081f38f1afb33157e64a8453dd
Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com>
Diffstat (limited to 'meta-openbmc-machines')
5 files changed, 37 insertions, 0 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend new file mode 100644 index 000000000..c1d50e6ff --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%.bbappend @@ -0,0 +1,24 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +INSTANCES = "motherboard/uuid motherboard/bmc/ethernet" +ITEMS_FMT = "system/chassis/{0}" + +ITEMS = "${@compose_list(d, 'ITEMS_FMT', 'INSTANCES')}" + +ENV_FILES = "obmc/sync_inventory_item/{0}" +SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENV_FILES', 'ITEMS')}" + +TMPL = "obmc-sync-inventory-item@.service" +TGT = "${SYSTEMD_DEFAULT_TARGET}" + +ETH_SVC = "system-chassis-motherboard-bmc-ethernet.service" +UUID_SVC = "system-chassis-motherboard-uuid.service" + +ETH_DROPIN_DIR = "obmc-sync-inventory-item@${ETH_SVC}.d" +UUID_DROPIN_DIR = "obmc-sync-inventory-item@${UUID_SVC}.d" + +SYSTEMD_OVERRIDE_${PN} += "mac_sync_inventory.conf:${ETH_DROPIN_DIR}/mac_sync_inventory.conf" +SYSTEMD_OVERRIDE_${PN} += "uuid_sync_inventory.conf:${UUID_DROPIN_DIR}/uuid_sync_inventory.conf" + +SYSTEMD_LINK_${PN} += "../${TMPL}:${TGT}.wants/obmc-sync-inventory-item@${ETH_SVC}" +SYSTEMD_LINK_${PN} += "../${TMPL}:${TGT}.wants/obmc-sync-inventory-item@${UUID_SVC}" diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/mac_sync_inventory.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/mac_sync_inventory.conf new file mode 100644 index 000000000..f04b6dd37 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/mac_sync_inventory.conf @@ -0,0 +1,6 @@ +[Unit] +Wants=mapper-wait@-xyz-openbmc_project-network-config.service +After=mapper-wait@-xyz-openbmc_project-network-config.service + +Wants=op-vpd-parser.service +After=op-vpd-parser.service diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/bmc/ethernet b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/bmc/ethernet new file mode 100644 index 000000000..722e0e641 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/bmc/ethernet @@ -0,0 +1,2 @@ +PROPERTY="MACAddress" +SYNC_TYPE=mac diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/uuid b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/uuid new file mode 100644 index 000000000..95abbc885 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/obmc/sync_inventory_item/system/chassis/motherboard/uuid @@ -0,0 +1,2 @@ +PROPERTY="UUID" +SYNC_TYPE=uuid diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/uuid_sync_inventory.conf b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/uuid_sync_inventory.conf new file mode 100644 index 000000000..587476244 --- /dev/null +++ b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-phosphor/chassis/obmc-mgr-inventory%/uuid_sync_inventory.conf @@ -0,0 +1,3 @@ +[Unit] +Wants=op-vpd-parser.service +After=op-vpd-parser.service |
