From 5200b47e1f4842d6f52030713fd95fd20002af3e Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Mon, 13 Apr 2015 15:43:05 +0200 Subject: [PATCH] meta-digi-arm: update layer for new MACHINE_SOCARCH_SUFFIX support After upstream (meta-fsl-arm) commit: https://git.yoctoproject.org/cgit/cgit.cgi/meta-fsl-arm/commit/?id=bfe01a0ebde407086f4a7710ea165c6beff310d7 our layer needs to be adapted. Otherwise the build is broken and fails with a bitbake parse error. Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/imx-digi-base.inc | 9 ++++----- meta-digi-arm/conf/machine/include/mxs-digi-base.inc | 5 ++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc index 596e2324b..67a08eff2 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -21,11 +21,10 @@ MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" DEFAULTTUNE_mx6 ?= "cortexa9hf-neon" # Sub-architecture support -MACHINE_SOCARCH ?= "" -MACHINE_SOCARCH_mx5 = "${TUNE_PKGARCH}-mx5" -MACHINE_SOCARCH_mx6q = "${TUNE_PKGARCH}-mx6qdl" -MACHINE_SOCARCH_mx6dl = "${TUNE_PKGARCH}-mx6qdl" -PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}" +MACHINE_SOCARCH_SUFFIX ?= "" +MACHINE_SOCARCH_SUFFIX_mx5 = "-mx5" +MACHINE_SOCARCH_SUFFIX_mx6q = "-mx6qdl" +MACHINE_SOCARCH_SUFFIX_mx6dl = "-mx6qdl" MACHINE_ARCH_FILTER = "virtual/kernel" MACHINE_SOCARCH_FILTER = "libfslcodec libfslvpuwrap libfslparser gst-fsl-plugins" diff --git a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc index dfa01f640..d35422a6d 100644 --- a/meta-digi-arm/conf/machine/include/mxs-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/mxs-digi-base.inc @@ -11,9 +11,8 @@ XSERVER = "xserver-xorg \ MACHINE_GSTREAMER_PLUGIN ?= "" # Sub-architecture support -MACHINE_SOCARCH ?= "" -MACHINE_SOCARCH_mx28 = "${TUNE_PKGARCH}-mx28" -PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}" +MACHINE_SOCARCH_SUFFIX ?= "" +MACHINE_SOCARCH_SUFFIX_mx28 = "-mx28" MACHINE_ARCH_FILTER = "virtual/kernel" MACHINE_SOCARCH_FILTER = "libfslcodec libfslvpuwrap libfslparser gst-fsl-plugins"