From 40900b7ef1db429ab56966340d56721cdadd172e Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Wed, 8 May 2019 21:02:48 -0400 Subject: meta-ibm: romulus: override variable assignments Add overrides to variable assignments as described in "Modify Variables to Support a Different Machine" in the yocto development tasks manual: https://www.yoctoproject.org/docs/latest/dev-manual/dev-manual.html#best-practices-to-follow-when-creating-layers In a nutshell this allows multiple BSP layers to be included simultaneously in bblayers.conf, which increases the potential for meta data sharing between layers. (From meta-ibm rev: 0ccb228f770fe8688fd926ad822244fab6926298) Change-Id: I4f648d1c2232a6f246b63b8e46731b7ef1af13ac Signed-off-by: Brad Bishop --- meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend | 2 +- .../fans/phosphor-fan-control-events-config-native.bbappend | 2 +- .../fans/phosphor-fan-control-fan-config-native.bbappend | 2 +- .../phosphor-fan-control-zone-conditions-config-native.bbappend | 2 +- .../fans/phosphor-fan-control-zone-config-native.bbappend | 2 +- .../fans/phosphor-fan-monitor-config-native.bbappend | 2 +- .../fans/phosphor-fan-presence-config-native.bbappend | 2 +- meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend | 6 +++--- .../recipes-phosphor/flash/phosphor-software-manager_%.bbappend | 2 +- meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend | 6 +++--- .../recipes-phosphor/images/obmc-phosphor-image.bbappend | 2 +- .../recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend | 2 +- .../ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend | 2 +- .../recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend | 2 +- meta-ibm/meta-romulus/recipes-phosphor/mboxd/mboxd_%.bbappend | 2 +- .../recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend | 4 ++-- .../meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 6 +++--- .../recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend | 2 +- 18 files changed, 25 insertions(+), 25 deletions(-) (limited to 'meta-ibm/meta-romulus') diff --git a/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend index fd0a1495c..664d7e114 100644 --- a/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,2 +1,2 @@ FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" -SRC_URI += "file://romulus.cfg" +SRC_URI_append_romulus = " file://romulus.cfg" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend index 72d991c7e..4db6f3a6d 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-events-config-native.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend index 72d991c7e..4db6f3a6d 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-fan-config-native.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend index 72d991c7e..4db6f3a6d 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-conditions-config-native.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend index 6d4804d12..7be43dde0 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-control-zone-config-native.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend index 72d991c7e..4db6f3a6d 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-monitor-config-native.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend index 72d991c7e..4db6f3a6d 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan-presence-config-native.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend index 98b0810fc..072623eab 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -1,11 +1,11 @@ -FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_append_romulus := "${THISDIR}/${PN}:" # Package configuration FAN_PACKAGES += " \ phosphor-cooling-type \ " -PACKAGECONFIG += "cooling-type" +PACKAGECONFIG_append_romulus = " cooling-type" TMPL_COOLING = "phosphor-cooling-type@.service" INSTFMT_COOLING = "phosphor-cooling-type@{0}.service" @@ -18,5 +18,5 @@ SYSTEMD_LINK_phosphor-cooling-type += "${@compose_list(d, 'FMT_COOLING', 'OBMC_C COOLING_ENV_FMT = "obmc/phosphor-fan/phosphor-cooling-type-{0}.conf" -SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type += "${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" +SYSTEMD_ENVIRONMENT_FILE_phosphor-cooling-type_append_romulus = " ${@compose_list(d, 'COOLING_ENV_FMT', 'OBMC_CHASSIS_INSTANCES')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index c92b1a89c..18f76ee3a 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_append = " verify_signature" +PACKAGECONFIG_append_romulus = " verify_signature" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend index 4cac4903f..278470fa7 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/host/p9-host-start.bbappend @@ -1,3 +1,3 @@ -RDEPENDS_${PN} += 'avsbus-control' -RDEPENDS_${PN} += 'vrm-control' -RDEPENDS_${PN}_remove += "p9-vcs-workaround" +RDEPENDS_${PN}_append_romulus = " avsbus-control" +RDEPENDS_${PN}_append_romulus = " vrm-control" +RDEPENDS_${PN}_remove_romulus = "p9-vcs-workaround" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/images/obmc-phosphor-image.bbappend index 772685db7..ccf7b4582 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1 +1 @@ -OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd liberation-fonts uart-render-controller" +OBMC_IMAGE_EXTRA_INSTALL_append_romulus = " mboxd liberation-fonts uart-render-controller" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend index 72d991c7e..4db6f3a6d 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend index 72d991c7e..4db6f3a6d 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-fru-read-bmc-inventory%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend index 72d991c7e..4db6f3a6d 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/mboxd/mboxd_%.bbappend index 8b6248a46..566fc6c34 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/mboxd/mboxd_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/mboxd/mboxd_%.bbappend @@ -1 +1 @@ -MBOXD_FLASH_SIZE = "64M" +MBOXD_FLASH_SIZE_romulus = "64M" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index ea1a7e3e6..920e529a5 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,2 +1,2 @@ -RDEPENDS_${PN}-inventory += " openpower-occ-control phosphor-cooling-type id-button" -RDEPENDS_${PN}-extras += " phosphor-webui phosphor-image-signing" +RDEPENDS_${PN}-inventory_append_romulus = " openpower-occ-control phosphor-cooling-type id-button" +RDEPENDS_${PN}-extras_append_romulus = " phosphor-webui phosphor-image-signing" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 9e6fbbd0f..c7d3bfcf3 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" EXTRA_OECONF_append_romulus = " --enable-negative-errno-on-fail" @@ -21,5 +21,5 @@ OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'OCCITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_romulus = " ${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_romulus = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" diff --git a/meta-ibm/meta-romulus/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-ibm/meta-romulus/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend index 72d991c7e..4db6f3a6d 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ b/meta-ibm/meta-romulus/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_romulus := "${THISDIR}/${PN}:" -- cgit v1.2.3