From 0e9e9c6c8fbd17f331e54d6427f4b82a721525bb Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 26 Aug 2016 15:35:09 +0300 Subject: bblayer.conf syntax changed Change-Id: I39f87fc49e1a9c1b4f5498fbaf8acfd044b0aeb8 Reviewed-by: Teemu Holappa --- conf/bblayers.conf.bbb.sample | 10 +++------- conf/bblayers.conf.emulator.sample | 10 +++------- conf/bblayers.conf.fsl.sample | 10 +++------- conf/bblayers.conf.intel.sample | 10 +++------- conf/bblayers.conf.nvidia-logan.sample | 11 +++-------- conf/bblayers.conf.nvidia-tegra.sample | 11 +++-------- conf/bblayers.conf.rcar-gen2.sample | 10 +++------- conf/bblayers.conf.rpi.sample | 10 +++------- conf/bblayers.conf.sample | 10 +++------- conf/bblayers.conf.smx6.sample | 10 +++------- conf/bblayers.conf.ti.sample | 10 +++------- conf/bblayers.conf.tibidabo.sample | 10 +++------- conf/bblayers.conf.toradex.sample | 10 +++------- 13 files changed, 39 insertions(+), 93 deletions(-) (limited to 'conf') diff --git a/conf/bblayers.conf.bbb.sample b/conf/bblayers.conf.bbb.sample index ddd469b..2a3ce11 100644 --- a/conf/bblayers.conf.bbb.sample +++ b/conf/bblayers.conf.bbb.sample @@ -27,9 +27,9 @@ ## ############################################################################ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ + ${BSPDIR}/sources/poky/meta-poky \ ${BSPDIR}/sources/meta-beagleboard/common-bsp \ ${BSPDIR}/sources/meta-ti \ ${BSPDIR}/sources/meta-fsl-arm \ @@ -52,7 +52,3 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-mingw \ ${BSPDIR}/sources/meta-qt5 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ - " diff --git a/conf/bblayers.conf.emulator.sample b/conf/bblayers.conf.emulator.sample index 75d7aae..381c488 100644 --- a/conf/bblayers.conf.emulator.sample +++ b/conf/bblayers.conf.emulator.sample @@ -27,9 +27,9 @@ ## ############################################################################ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ + ${BSPDIR}/sources/poky/meta-poky \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-openembedded/meta-python \ ${BSPDIR}/sources/meta-openembedded/meta-networking \ @@ -47,7 +47,3 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-mingw \ ${BSPDIR}/sources/meta-qt5 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ - " diff --git a/conf/bblayers.conf.fsl.sample b/conf/bblayers.conf.fsl.sample index 1a255de..61e12fa 100644 --- a/conf/bblayers.conf.fsl.sample +++ b/conf/bblayers.conf.fsl.sample @@ -27,9 +27,9 @@ ## ############################################################################ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ + ${BSPDIR}/sources/poky/meta-poky \ ${BSPDIR}/sources/meta-fsl-arm \ ${BSPDIR}/sources/meta-fsl-arm-extra \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ @@ -50,7 +50,3 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-mingw \ ${BSPDIR}/sources/meta-qt5 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ - " diff --git a/conf/bblayers.conf.intel.sample b/conf/bblayers.conf.intel.sample index c03ad50..e6094d6 100644 --- a/conf/bblayers.conf.intel.sample +++ b/conf/bblayers.conf.intel.sample @@ -27,9 +27,9 @@ ## ############################################################################ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ + ${BSPDIR}/sources/poky/meta-poky \ ${BSPDIR}/sources/meta-intel \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-openembedded/meta-python \ @@ -49,7 +49,3 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-mingw \ ${BSPDIR}/sources/meta-qt5 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ - " diff --git a/conf/bblayers.conf.nvidia-logan.sample b/conf/bblayers.conf.nvidia-logan.sample index f893f8c..9a7272c 100644 --- a/conf/bblayers.conf.nvidia-logan.sample +++ b/conf/bblayers.conf.nvidia-logan.sample @@ -27,9 +27,9 @@ ## ############################################################################ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ + ${BSPDIR}/sources/poky/meta-poky \ ${BSPDIR}/sources/nvidia-layer/meta-tegra \ ${BSPDIR}/sources/nvidia-layer/meta-vib3 \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ @@ -51,8 +51,3 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-mingw \ ${BSPDIR}/sources/meta-qt5 \ " - -BBLAYERS_NON_REMOVABLE ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ - " diff --git a/conf/bblayers.conf.nvidia-tegra.sample b/conf/bblayers.conf.nvidia-tegra.sample index 1fbce2b..ec480ef 100644 --- a/conf/bblayers.conf.nvidia-tegra.sample +++ b/conf/bblayers.conf.nvidia-tegra.sample @@ -27,9 +27,9 @@ ## ############################################################################ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ + ${BSPDIR}/sources/poky/meta-poky \ ${BSPDIR}/sources/nvidia-layer/meta-tegra \ ${BSPDIR}/sources/nvidia-layer/meta-vib4 \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ @@ -51,8 +51,3 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-mingw \ ${BSPDIR}/sources/meta-qt5 \ " - -BBLAYERS_NON_REMOVABLE ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ - " diff --git a/conf/bblayers.conf.rcar-gen2.sample b/conf/bblayers.conf.rcar-gen2.sample index f19b1ea..6fc5144 100644 --- a/conf/bblayers.conf.rcar-gen2.sample +++ b/conf/bblayers.conf.rcar-gen2.sample @@ -27,9 +27,9 @@ ## ############################################################################ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -38,7 +38,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' BBLAYERS ?= " \ ${BSPDIR}/sources/meta-boot2qt \ ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ + ${BSPDIR}/sources/poky/meta-poky \ ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \ ${BSPDIR}/sources/meta-fsl-arm \ ${BSPDIR}/sources/meta-renesas \ @@ -51,7 +51,3 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-qt5 \ ${BSPDIR}/sources/meta-mingw \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ - " diff --git a/conf/bblayers.conf.rpi.sample b/conf/bblayers.conf.rpi.sample index c788ab0..e376bea 100644 --- a/conf/bblayers.conf.rpi.sample +++ b/conf/bblayers.conf.rpi.sample @@ -27,9 +27,9 @@ ## ############################################################################ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ + ${BSPDIR}/sources/poky/meta-poky \ ${BSPDIR}/sources/meta-raspberrypi \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ ${BSPDIR}/sources/meta-openembedded/meta-python \ @@ -49,7 +49,3 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-mingw \ ${BSPDIR}/sources/meta-qt5 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ - " diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample index 8b3e578..6bd83c8 100644 --- a/conf/bblayers.conf.sample +++ b/conf/bblayers.conf.sample @@ -27,9 +27,9 @@ ## ############################################################################ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ + ${BSPDIR}/sources/poky/meta-poky \ ${BSPDIR}/sources/meta-fsl-arm \ ${BSPDIR}/sources/meta-fsl-arm-extra \ ${BSPDIR}/sources/meta-beagleboard/common-bsp \ @@ -54,7 +54,3 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-mingw \ ${BSPDIR}/sources/meta-qt5 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ - " diff --git a/conf/bblayers.conf.smx6.sample b/conf/bblayers.conf.smx6.sample index 55a9535..b10e415 100644 --- a/conf/bblayers.conf.smx6.sample +++ b/conf/bblayers.conf.smx6.sample @@ -27,9 +27,9 @@ ## ############################################################################ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ + ${BSPDIR}/sources/poky/meta-poky \ ${BSPDIR}/sources/meta-fsl-arm \ ${BSPDIR}/sources/meta-fsl-arm-extra \ ${BSPDIR}/sources/meta-smx6 \ @@ -52,7 +52,3 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-mingw \ ${BSPDIR}/sources/meta-qt5 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ - " diff --git a/conf/bblayers.conf.ti.sample b/conf/bblayers.conf.ti.sample index 527b404..8ad8960 100644 --- a/conf/bblayers.conf.ti.sample +++ b/conf/bblayers.conf.ti.sample @@ -27,9 +27,9 @@ ## ############################################################################ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ + ${BSPDIR}/sources/poky/meta-poky \ ${BSPDIR}/sources/meta-ti \ ${BSPDIR}/sources/meta-fsl-arm \ ${BSPDIR}/sources/meta-openembedded/meta-oe \ @@ -50,7 +50,3 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-mingw \ ${BSPDIR}/sources/meta-qt5 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ - " diff --git a/conf/bblayers.conf.tibidabo.sample b/conf/bblayers.conf.tibidabo.sample index 6351d1f..e71d646 100644 --- a/conf/bblayers.conf.tibidabo.sample +++ b/conf/bblayers.conf.tibidabo.sample @@ -27,9 +27,9 @@ ## ############################################################################ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ + ${BSPDIR}/sources/poky/meta-poky \ ${BSPDIR}/sources/meta-fsl-arm \ ${BSPDIR}/sources/meta-fsl-arm-extra \ ${BSPDIR}/sources/meta-tibidabo \ @@ -52,7 +52,3 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-mingw \ ${BSPDIR}/sources/meta-qt5 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ - " diff --git a/conf/bblayers.conf.toradex.sample b/conf/bblayers.conf.toradex.sample index 7e49d04..9472025 100644 --- a/conf/bblayers.conf.toradex.sample +++ b/conf/bblayers.conf.toradex.sample @@ -27,9 +27,9 @@ ## ############################################################################ -# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf +# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf # changes incompatibly -LCONF_VERSION = "6" +POKY_BBLAYERS_CONF_VERSION = "2" BBPATH = "${TOPDIR}" BBFILES ?= "" @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' BBLAYERS ?= " \ ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ + ${BSPDIR}/sources/poky/meta-poky \ ${BSPDIR}/sources/meta-toradex \ ${BSPDIR}/sources/meta-fsl-arm \ ${BSPDIR}/sources/meta-fsl-arm-extra \ @@ -52,7 +52,3 @@ BBLAYERS ?= " \ ${BSPDIR}/sources/meta-mingw \ ${BSPDIR}/sources/meta-qt5 \ " -BBLAYERS_NON_REMOVABLE ?= " \ - ${BSPDIR}/sources/poky/meta \ - ${BSPDIR}/sources/poky/meta-yocto \ - " -- cgit v1.2.3-54-g00ecf