From 08a721eea2cb480e6879a7de15dea68e5a236570 Mon Sep 17 00:00:00 2001 From: Mihail Grigorov Date: Thu, 26 Oct 2017 17:23:40 +0300 Subject: meta-agl-bsp: templates: update of nitrogen6x machine template Bug-AGL: SPEC-905 Change-Id: I959a9f8d085b0fb247998790191c3dcf2e4e34fa Signed-off-by: Mihail Grigorov Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11567 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller Reviewed-by: Matt Porter --- meta-agl-bsp/conf/include/agl_nitrogen6x.inc | 5 +++++ templates/machine/nitrogen6x/40_bblayers.conf.inc | 6 ++++++ templates/machine/nitrogen6x/50_bblayers.conf.inc | 6 ------ 3 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 templates/machine/nitrogen6x/40_bblayers.conf.inc delete mode 100644 templates/machine/nitrogen6x/50_bblayers.conf.inc diff --git a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc index 4fb05725c..9f2345330 100644 --- a/meta-agl-bsp/conf/include/agl_nitrogen6x.inc +++ b/meta-agl-bsp/conf/include/agl_nitrogen6x.inc @@ -3,3 +3,8 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot-imx6" PREFERRED_PROVIDER_u-boot-mxsboot-native = "u-boot-imx6" AGL_DEFAULT_IMAGE_FSTYPES = "sdcard.gz" + +# prevent of build errors from missing bb files +BBMASK = "meta-boundary/recipes-(browser|mozilla)" + +PREFERRED_VERSION_weston_mx6_forcevariable = "2.0.0" diff --git a/templates/machine/nitrogen6x/40_bblayers.conf.inc b/templates/machine/nitrogen6x/40_bblayers.conf.inc new file mode 100644 index 000000000..2377ff6bc --- /dev/null +++ b/templates/machine/nitrogen6x/40_bblayers.conf.inc @@ -0,0 +1,6 @@ +BBLAYERS =+ "\ + ${METADIR}/meta-freescale \ + ${METADIR}/meta-freescale-3rdparty \ + ${METADIR}/meta-freescale-distro \ + ${METADIR}/meta-boundary \ + " diff --git a/templates/machine/nitrogen6x/50_bblayers.conf.inc b/templates/machine/nitrogen6x/50_bblayers.conf.inc deleted file mode 100644 index 2377ff6bc..000000000 --- a/templates/machine/nitrogen6x/50_bblayers.conf.inc +++ /dev/null @@ -1,6 +0,0 @@ -BBLAYERS =+ "\ - ${METADIR}/meta-freescale \ - ${METADIR}/meta-freescale-3rdparty \ - ${METADIR}/meta-freescale-distro \ - ${METADIR}/meta-boundary \ - " -- cgit 1.2.3-korg