summaryrefslogtreecommitdiffstats
path: root/meta-openbmc-machines/meta-openpower
diff options
context:
space:
mode:
authorXo Wang <xow@google.com>2017-01-18 18:15:12 -0800
committerPatrick Williams <patrick@stwcx.xyz>2017-01-26 03:39:33 +0000
commitb80be13d826ca320556cfaf2c30830b11e11c7a2 (patch)
tree3602571f809e107c7cf0bde741239f5142debb7d /meta-openbmc-machines/meta-openpower
parentcd021293f1264ace3b0833e63a3f9b4a20fd1ef4 (diff)
downloadtalos-openbmc-b80be13d826ca320556cfaf2c30830b11e11c7a2.tar.gz
talos-openbmc-b80be13d826ca320556cfaf2c30830b11e11c7a2.zip
meta-zaius: Modify recipe variables based on machine
In bbappend files, use the override style syntax to modify variables and specify appends and prepends with the machine name. This limits the scope of their effects to only when MACHINE=zaius. This allows meta-zaius to be present in BBLAYERS without causing side effects except when building for Zaius BMC. Signed-off-by: Xo Wang <xow@google.com> Change-Id: Iaccc5cb1abac033dab54411eaa20855172ad3283
Diffstat (limited to 'meta-openbmc-machines/meta-openpower')
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot_%.bbappend6
-rw-r--r--meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend4
2 files changed, 5 insertions, 5 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot_%.bbappend
index 134fcd4de..1686be066 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,3 +1,3 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/u-boot:"
-SRC_URI += "file://0001-board-aspeed-Add-reset_phy-for-Zaius.patch"
-SRC_URI += "file://0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch"
+FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:"
+SRC_URI_append_zaius = " file://0001-board-aspeed-Add-reset_phy-for-Zaius.patch \
+ file://0002-board-aspeed-aspeednic-Use-MAC2-for-networking.patch"
diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend
index 543bfe001..f3a83990b 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend
+++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-kernel/linux/linux-obmc_%.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/linux-obmc:"
-SRC_URI += "file://zaius.cfg"
+FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:"
+SRC_URI_append_zaius = " file://zaius.cfg"
OpenPOWER on IntegriCloud