| commit | 51af974f81c1d8a6df250fb38c27c1a0444b2cf3 | [log] [tgz] |
|---|---|---|
| author | Patrick Venture <venture@google.com> | Thu Jun 29 12:22:12 2017 -0700 |
| committer | Patrick Williams <patrick@stwcx.xyz> | Thu Jul 06 21:46:08 2017 +0000 |
| tree | 4fd1fee80e821aa99948e0782b213276c6420edc | |
| parent | 1008b48d57edae2cb8a71cb6842cb6868ca19b99 [diff] |
Add override for aspeed bsp machine. Upstream yocto is organized such that there is only bblayer for all builds and overrides are used to customize recipes for any specific platform. It's possible for a group to use openbmc/openbmc as part of their distro and run into issues with recipes that are comingled. Change-Id: I5dc6e8c1448d95da1b5ee64b220e2955466cdf4e Signed-off-by: Patrick Venture <venture@google.com>
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc index 94e9a59..01f299c 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/conf/machine/include/ast2500.inc
@@ -14,4 +14,6 @@ SERIAL_CONSOLES = "115200;ttyS4" +MACHINEOVERRIDES .= ":ast2500" + require conf/machine/include/arm/arch-armv6.inc
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend index 070f389..ece33b0 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend
@@ -1,8 +1,8 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS_prepend_ast2500 := "${THISDIR}/files:" -SRC_URI += "file://fw_env.config" +SRC_URI_append_ast2500 = " file://fw_env.config" -do_install_append() { +do_install_append_ast2500() { if [ -e ${WORKDIR}/fw_env.config ] ; then install -d ${D}${sysconfdir} install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/u-boot_%.bbappend index ef6a709..f214b22 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS_prepend_ast2500 := "${THISDIR}/files:" -SRC_URI += "file://fw_env.config" +SRC_URI_append_ast2500 = " file://fw_env.config"
diff --git a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc_%.bbappend b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc_%.bbappend index 6d7ae27..ee9a010 100644 --- a/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc_%.bbappend +++ b/meta-openbmc-bsp/meta-aspeed/meta-ast2500/recipes-kernel/linux/linux-obmc_%.bbappend
@@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://defconfig" +FILESEXTRAPATHS_prepend_ast2500 := "${THISDIR}/${PN}:" +SRC_URI_append_ast2500 = " file://defconfig"