diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-05-09 00:08:38 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-05-23 00:12:13 +0300 |
| commit | efc15430aebfe9f3ff6e8e8bf6d62dbacddf47da (patch) | |
| tree | 8b0b0c266b124f8ec8f9ca52fd5568948537ba48 /meta-ibm/meta-palmetto | |
| parent | b5d335c064534c235bb7fe7758825256bf934572 (diff) | |
| download | openbmc-efc15430aebfe9f3ff6e8e8bf6d62dbacddf47da.tar.xz | |
meta-ibm: palmetto: 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: a7ed71c672baa533eddcc8cc713b03d2ee07c4e4)
Change-Id: Id057b3520db5952310b31f188e53263653606d54
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-ibm/meta-palmetto')
8 files changed, 10 insertions, 10 deletions
diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor.bbappend index 72d991c7e..2d3355993 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/host/checkstop-monitor.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/images/obmc-phosphor-image.bbappend index aa57bbfe6..755346060 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1 +1 @@ -OBMC_IMAGE_EXTRA_INSTALL_append = " mboxd" +OBMC_IMAGE_EXTRA_INSTALL_append_palmetto = " mboxd" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bbappend index 72d991c7e..2d3355993 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-fru-properties-native.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bbappend index 72d991c7e..2d3355993 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/ipmi/phosphor-ipmi-sensor-inventory-native.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native_%.bbappend index 836ef56aa..b5ea3704a 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/mrw/mrw-native_%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://palmetto.xml.patch.xml" +FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" +SRC_URI_append_palmetto = " file://palmetto.xml.patch.xml" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index e5b837abc..c0748b966 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1 +1 @@ -RDEPENDS_${PN}-inventory += "openpower-occ-control" +RDEPENDS_${PN}-inventory_append_palmetto = " openpower-occ-control" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index c3650f468..bff849791 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" NAMES = " \ bus@1e78a000/i2c-bus@40/rtc@68 \ @@ -10,4 +10,4 @@ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'NAMES')}" ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append_palmetto = " ${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend b/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend index 72d991c7e..2d3355993 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend +++ b/meta-ibm/meta-palmetto/recipes-phosphor/skeleton/obmc-libobmc-intf_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS_prepend_palmetto := "${THISDIR}/${PN}:" |