From: Otavio Salvador Date: Mon, 10 Jul 2017 15:01:12 +0000 (-0300) Subject: alsa-lib: Ensure MACHINE_SOCARCH is used consistently X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c78799dd1b80aeb40d827a6c61c5be66a0aeecdb;p=meta-freescale.git alsa-lib: Ensure MACHINE_SOCARCH is used consistently The alsa-lib needs to apply the patches for all i.MX SoCs so using the 'imx' override seems to be the best choice for this specific use-case. A missing aspect though was that this should also affect every package which /depends/ on alsa-lib (e.g: alsa-utils) so it also goes to MACHINE_SOCARCH architecture fixing the signature change across different machines. This fix has been tested using a massive parallel build using multiconfig. Signed-off-by: Otavio Salvador --- diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 04d22d8d..6c7e494e 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -91,6 +91,7 @@ MACHINE_SOCARCH_SUFFIX_mx6ull = "-mx6ul" MACHINE_SOCARCH_SUFFIX_use-mainline-bsp = "-imx" MACHINE_ARCH_FILTER = "virtual/kernel" +MACHINE_SOCARCH_FILTER_append_imx = " alsa-lib" MACHINE_SOCARCH_FILTER_append_imxvpu = " imx-vpu libimxvpuapi imx-codec imx-vpuwrap imx-parser" MACHINE_SOCARCH_FILTER_append_imxgpu2d = " virtual/libopenvg virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl virtual/libg2d cairo pango weston" MACHINE_SOCARCH_FILTER_append_imxpxp = " imx-codec imx-parser" diff --git a/recipes-multimedia/alsa/alsa-lib_%.bbappend b/recipes-multimedia/alsa/alsa-lib_%.bbappend index bfe346cc..235a3b14 100644 --- a/recipes-multimedia/alsa/alsa-lib_%.bbappend +++ b/recipes-multimedia/alsa/alsa-lib_%.bbappend @@ -3,8 +3,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" IMX_PATCH = " file://0001-add-conf-for-multichannel-support-in-imx.patch \ file://0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch" -SRC_URI_append_mx6 = "${IMX_PATCH}" -SRC_URI_append_mx7 = "${IMX_PATCH}" +SRC_URI_append_imx = "${IMX_PATCH}" -PACKAGE_ARCH_mx6 = "${MACHINE_SOCARCH}" -PACKAGE_ARCH_mx7 = "${MACHINE_SOCARCH}" +PACKAGE_ARCH_imx = "${MACHINE_SOCARCH}"