| commit | bb0e1d0699a4b9905c053c94af7d882cd71779fc | [log] [tgz] |
|---|---|---|
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | Wed Jul 17 17:35:55 2019 -0400 |
| committer | Brad Bishop <radsquirrel@gmail.com> | Wed Jul 24 00:52:11 2019 +0000 |
| tree | f34b67e478b4802d774ee38e3b99527a1f046e65 | |
| parent | 8f7ff601395419a933eb0506d5cc07fd805f7708 [diff] |
meta-ibm: use ibm-ac-server MACHINEOVERRIDE Use an override in bbappends in meta-witherspoon as described and recommended in the "following best practices when creating layers" section of the the Yocto development tasks manual. ibm-ac-server represents common machine configuration shared by all of IBMs "Accelerated Compute" class of servers. Apply it wherever any variables are un-bounded by any override. This enables more flexible use of meta-witherspoon in build configurations, and easy addition of machines to the layer. Change-Id: I637588acbaf76f90809b02e48e7fce461b46f6db Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend index 588f23e..ae379af 100644 --- a/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend +++ b/meta-witherspoon/recipes-phosphor/ipmi/openpower-ipmi-oem_%.bbappend
@@ -1,5 +1,5 @@ -DEPENDS_append = " acx22-yaml-config" +DEPENDS_append_ibm-ac-server = " acx22-yaml-config" -EXTRA_OECONF = " \ +EXTRA_OECONF_ibm-ac-server = " \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \ "
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend index 3256e83..e3e5002 100644 --- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend +++ b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config.bbappend
@@ -16,7 +16,7 @@ unset do_patch[noexec] do_patch[depends] = "os-release:do_populate_sysroot" -python do_patch() { +python do_patch_ibm-ac-server() { import json import re from shutil import copyfile
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dcmi_sensors.json similarity index 100% rename from meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json rename to meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dcmi_sensors.json
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dev_id.json similarity index 100% rename from meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/dev_id.json rename to meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/dev_id.json
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/power_reading.json similarity index 100% rename from meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/power_reading.json rename to meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/ibm-ac-server/power_reading.json
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend index 408364c..2da9493 100644 --- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend
@@ -1,6 +1,6 @@ -DEPENDS_append = " acx22-yaml-config" +DEPENDS_append_ibm-ac-server = " acx22-yaml-config" -EXTRA_OECONF = " \ +EXTRA_OECONF_ibm-ac-server = " \ YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \ PROP_YAML=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-extra-properties.yaml \ "
diff --git a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 16b1379..3fdcada 100644 --- a/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,6 +1,6 @@ -DEPENDS_append = " acx22-yaml-config" +DEPENDS_append_ibm-ac-server = " acx22-yaml-config" -EXTRA_OECONF = " \ +EXTRA_OECONF_ibm-ac-server = " \ SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-sensors.yaml \ INVSENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-inventory-sensors.yaml \ FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/acx22-yaml-config/ipmi-fru-read.yaml \