From 1b2c904f1e4403b59fc51f8f68d4fa8f05d03332 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Wed, 24 Jul 2019 16:17:43 -0400 Subject: Fix i.MX6 multiple package tuning problem Update the i.MX6 machine definition include files to disable the dynamic package architecture logic in meta-freescale, as it conflicts with AGL's setting of DEFAULTTUNE and results in a split package feed. Bug-AGL: SPEC-2665 Change-Id: I66ff03b0bc48b3b768b9ec88c907eaa95e1a2b00 Signed-off-by: Scott Murray --- meta-agl-bsp/conf/include/agl_cubox-i.inc | 5 +++++ meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc | 5 +++++ meta-agl-bsp/conf/include/agl_nitrogen6x.inc | 5 +++++ 3 files changed, 15 insertions(+) (limited to 'meta-agl-bsp/conf') diff --git a/meta-agl-bsp/conf/include/agl_cubox-i.inc b/meta-agl-bsp/conf/include/agl_cubox-i.inc index a82c27cc1..b43ef47c8 100644 --- a/meta-agl-bsp/conf/include/agl_cubox-i.inc +++ b/meta-agl-bsp/conf/include/agl_cubox-i.inc @@ -4,6 +4,11 @@ DISTRO_FEATURES_append = " agl-medium-arm-compiler" # etnaviv support. MACHINEOVERRIDES .= ":use-mainline-bsp" +# Disable meta-freescale package architecure mangling, as it causes +# issues with AGL's explicit setting of DEFAULTTUNE. +INHERIT_remove = "fsl-dynamic-packagearch" +MACHINE_SOCARCH = "${TUNE_PKGARCH}" + # Include devicetrees for SOM 1.5 and Hummingboard 2 hardware KERNEL_DEVICETREE_append = " \ imx6dl-hummingboard-som-v15.dtb imx6q-hummingboard-som-v15.dtb \ diff --git a/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc b/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc index b3658af3c..b56917781 100644 --- a/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc +++ b/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc @@ -4,6 +4,11 @@ DISTRO_FEATURES_append = " agl-medium-arm-compiler" # etnaviv support. MACHINEOVERRIDES .= ":use-mainline-bsp" +# Disable meta-freescale package architecure mangling, as it causes +# issues with AGL's explicit setting of DEFAULTTUNE. +INHERIT_remove = "fsl-dynamic-packagearch" +MACHINE_SOCARCH = "${TUNE_PKGARCH}" + # Disable the meta-freescale weston-init bbappend as it conflicts # with AGL's. BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init" diff --git a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc index 782e618a2..5864354b5 100644 --- a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc +++ b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc @@ -4,6 +4,11 @@ DISTRO_FEATURES_append = " agl-medium-arm-compiler" # etnaviv support. MACHINEOVERRIDES .= ":use-mainline-bsp" +# Disable meta-freescale package architecure mangling, as it causes +# issues with AGL's explicit setting of DEFAULTTUNE. +INHERIT_remove = "fsl-dynamic-packagearch" +MACHINE_SOCARCH = "${TUNE_PKGARCH}" + # Disable the meta-freescale weston-init bbappend as it conflicts # with AGL's. BBMASK = "meta-freescale/recipes-graphics/wayland/weston-init" -- cgit 1.2.3-korg