From 55afc49f4f2fae0911f571281dd920c51b6ad390 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Thu, 26 Jan 2017 11:24:04 +0200 Subject: Initial morty branch setup for poky & meta layers New or updated branches: * meta-fsl-arm & meta-fsl-arm-extra layers changes to meta-freescale & meta-freescale-3rdparty (morty) * poky (morty) * meta-openembedded (morty) * meta-qt5 (5.9) * meta-mingw (morty) * meta-tegra (morty) Modified accordingly: * conf/.sample files * classes/image_dd.class * conf/distro .inc files * scripts/manifest.xml Change-Id: Ia8ad563f2f1176882019490f274a6b4bb043475f Reviewed-by: Samuli Piippo --- classes/image_dd.bbclass | 2 +- conf/bblayers.conf.fsl.sample | 4 ++-- conf/bblayers.conf.rcar-gen2.sample | 2 +- conf/bblayers.conf.smx6.sample | 4 ++-- conf/bblayers.conf.ti.sample | 2 +- conf/distro/include/fsl.inc | 2 +- conf/distro/include/rcar-gen2.inc | 2 +- scripts/manifest.xml | 24 ++++++++++++------------ 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/classes/image_dd.bbclass b/classes/image_dd.bbclass index 07cd58f..cdb1054 100644 --- a/classes/image_dd.bbclass +++ b/classes/image_dd.bbclass @@ -27,7 +27,7 @@ ## ############################################################################ -# This class is based on meta-fsl-arm/classes/image_types_fsl.bbclass::generate_imx_sdcard() +# This class is based on meta-freescale/classes/image_types_fsl.bbclass::generate_imx_sdcard() DESCRIPTION = "The base class for building images that can be deployed with GNU coreutils dd tool." inherit image_types diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample index 61e12fa..389cb82 100644 --- a/conf/bblayers.conf.fsl.sample +++ b/conf/bblayers.conf.fsl.sample @@ -38,8 +38,8 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ ${BSPDIR}/sources/poky/meta-poky \ - ${BSPDIR}/sources/meta-fsl-arm \ - ${BSPDIR}/sources/meta-fsl-arm-extra \ + ${BSPDIR}/sources/meta-freescale \ + ${BSPDIR}/sources/meta-freescale-3rdparty \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-openembedded/meta-python \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ diff --git a/conf/bblayers.conf.rcar-gen2.sample b/conf/bblayers.conf.rcar-gen2.sample index 27f28ae..737f968 100644 --- a/conf/bblayers.conf.rcar-gen2.sample +++ b/conf/bblayers.conf.rcar-gen2.sample @@ -42,7 +42,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ ${BSPDIR}/sources/poky/meta-poky \ ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \ - ${BSPDIR}/sources/meta-fsl-arm \ + ${BSPDIR}/sources/meta-freescale \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-openembedded/meta-python \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ diff --git a/conf/bblayers.conf.smx6.sample b/conf/bblayers.conf.smx6.sample index b10e415..4c634ec 100644 --- a/conf/bblayers.conf.smx6.sample +++ b/conf/bblayers.conf.smx6.sample @@ -38,8 +38,8 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ ${BSPDIR}/sources/poky/meta-poky \ - ${BSPDIR}/sources/meta-fsl-arm \ - ${BSPDIR}/sources/meta-fsl-arm-extra \ + ${BSPDIR}/sources/meta-freescale \ + ${BSPDIR}/sources/meta-freescale-3rdparty \ ${BSPDIR}/sources/meta-smx6 \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-openembedded/meta-python \ diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample index 8ad8960..d97a613 100644 --- a/conf/bblayers.conf.ti.sample +++ b/conf/bblayers.conf.ti.sample @@ -39,7 +39,7 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ ${BSPDIR}/sources/poky/meta-poky \ ${BSPDIR}/sources/meta-ti \ - ${BSPDIR}/sources/meta-fsl-arm \ + ${BSPDIR}/sources/meta-freescale \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-openembedded/meta-python \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ diff --git a/conf/distro/include/fsl.inc b/conf/distro/include/fsl.inc index bdd0b88..32fec1b 100644 --- a/conf/distro/include/fsl.inc +++ b/conf/distro/include/fsl.inc @@ -27,7 +27,7 @@ ## ############################################################################ -BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5" +BBMASK += "meta-freescale/dynamic-layers/qt5-layer/recipes-qt/qt5" IMAGE_FSTYPES += "ext3 sdcard" IMAGE_CLASSES += "image_types_fsl" diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc index 9705877..854ac2c 100644 --- a/conf/distro/include/rcar-gen2.inc +++ b/conf/distro/include/rcar-gen2.inc @@ -134,6 +134,6 @@ BBMASK += "\ dtv-module ssp-module scu-module \ gles-test-module \ poky/meta/recipes-graphics/mesa \ - meta-fsl-arm/recipes-graphics/mesa \ + meta-freescale/recipes-graphics/mesa \ meta-rcar-gen2/recipes-devtools/file \ " diff --git a/scripts/manifest.xml b/scripts/manifest.xml index 1d99d3c..7259c71 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -16,25 +16,25 @@ + revision="bfda0f040958b3c533123071ff031037389eed62"/> - - -- cgit v1.2.3-54-g00ecf