diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-08-26 15:35:09 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-12 12:34:31 +0000 |
| commit | 0e9e9c6c8fbd17f331e54d6427f4b82a721525bb (patch) | |
| tree | e2d5c2d449cfed5be75f3feb4cd7aa40c09a8d21 | |
| parent | 666bc23e22d1a03572cf35d31e58ea903b4051c1 (diff) | |
| download | meta-boot2qt-0e9e9c6c8fbd17f331e54d6427f4b82a721525bb.tar.gz | |
bblayer.conf syntax changed
Change-Id: I39f87fc49e1a9c1b4f5498fbaf8acfd044b0aeb8
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
| -rw-r--r-- | conf/bblayers.conf.bbb.sample | 10 | ||||
| -rw-r--r-- | conf/bblayers.conf.emulator.sample | 10 | ||||
| -rw-r--r-- | conf/bblayers.conf.fsl.sample | 10 | ||||
| -rw-r--r-- | conf/bblayers.conf.intel.sample | 10 | ||||
| -rw-r--r-- | conf/bblayers.conf.nvidia-logan.sample | 11 | ||||
| -rw-r--r-- | conf/bblayers.conf.nvidia-tegra.sample | 11 | ||||
| -rw-r--r-- | conf/bblayers.conf.rcar-gen2.sample | 10 | ||||
| -rw-r--r-- | conf/bblayers.conf.rpi.sample | 10 | ||||
| -rw-r--r-- | conf/bblayers.conf.sample | 10 | ||||
| -rw-r--r-- | conf/bblayers.conf.smx6.sample | 10 | ||||
| -rw-r--r-- | conf/bblayers.conf.ti.sample | 10 | ||||
| -rw-r--r-- | conf/bblayers.conf.tibidabo.sample | 10 | ||||
| -rw-r--r-- | conf/bblayers.conf.toradex.sample | 10 |
13 files changed, 39 insertions, 93 deletions
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 @@ | |||
| 27 | ## | 27 | ## |
| 28 | ############################################################################ | 28 | ############################################################################ |
| 29 | 29 | ||
| 30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
| 31 | # changes incompatibly | 31 | # changes incompatibly |
| 32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
| 33 | 33 | ||
| 34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
| 35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
| @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
| 37 | 37 | ||
| 38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
| 39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
| 40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
| 41 | ${BSPDIR}/sources/meta-beagleboard/common-bsp \ | 41 | ${BSPDIR}/sources/meta-beagleboard/common-bsp \ |
| 42 | ${BSPDIR}/sources/meta-ti \ | 42 | ${BSPDIR}/sources/meta-ti \ |
| 43 | ${BSPDIR}/sources/meta-fsl-arm \ | 43 | ${BSPDIR}/sources/meta-fsl-arm \ |
| @@ -52,7 +52,3 @@ BBLAYERS ?= " \ | |||
| 52 | ${BSPDIR}/sources/meta-mingw \ | 52 | ${BSPDIR}/sources/meta-mingw \ |
| 53 | ${BSPDIR}/sources/meta-qt5 \ | 53 | ${BSPDIR}/sources/meta-qt5 \ |
| 54 | " | 54 | " |
| 55 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
| 56 | ${BSPDIR}/sources/poky/meta \ | ||
| 57 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
| 58 | " | ||
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 @@ | |||
| 27 | ## | 27 | ## |
| 28 | ############################################################################ | 28 | ############################################################################ |
| 29 | 29 | ||
| 30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
| 31 | # changes incompatibly | 31 | # changes incompatibly |
| 32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
| 33 | 33 | ||
| 34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
| 35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
| @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
| 37 | 37 | ||
| 38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
| 39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
| 40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
| 41 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 41 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
| 42 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | 42 | ${BSPDIR}/sources/meta-openembedded/meta-python \ |
| 43 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ | 43 | ${BSPDIR}/sources/meta-openembedded/meta-networking \ |
| @@ -47,7 +47,3 @@ BBLAYERS ?= " \ | |||
| 47 | ${BSPDIR}/sources/meta-mingw \ | 47 | ${BSPDIR}/sources/meta-mingw \ |
| 48 | ${BSPDIR}/sources/meta-qt5 \ | 48 | ${BSPDIR}/sources/meta-qt5 \ |
| 49 | " | 49 | " |
| 50 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
| 51 | ${BSPDIR}/sources/poky/meta \ | ||
| 52 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
| 53 | " | ||
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 @@ | |||
| 27 | ## | 27 | ## |
| 28 | ############################################################################ | 28 | ############################################################################ |
| 29 | 29 | ||
| 30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
| 31 | # changes incompatibly | 31 | # changes incompatibly |
| 32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
| 33 | 33 | ||
| 34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
| 35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
| @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
| 37 | 37 | ||
| 38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
| 39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
| 40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
| 41 | ${BSPDIR}/sources/meta-fsl-arm \ | 41 | ${BSPDIR}/sources/meta-fsl-arm \ |
| 42 | ${BSPDIR}/sources/meta-fsl-arm-extra \ | 42 | ${BSPDIR}/sources/meta-fsl-arm-extra \ |
| 43 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 43 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
| @@ -50,7 +50,3 @@ BBLAYERS ?= " \ | |||
| 50 | ${BSPDIR}/sources/meta-mingw \ | 50 | ${BSPDIR}/sources/meta-mingw \ |
| 51 | ${BSPDIR}/sources/meta-qt5 \ | 51 | ${BSPDIR}/sources/meta-qt5 \ |
| 52 | " | 52 | " |
| 53 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
| 54 | ${BSPDIR}/sources/poky/meta \ | ||
| 55 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
| 56 | " | ||
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 @@ | |||
| 27 | ## | 27 | ## |
| 28 | ############################################################################ | 28 | ############################################################################ |
| 29 | 29 | ||
| 30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
| 31 | # changes incompatibly | 31 | # changes incompatibly |
| 32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
| 33 | 33 | ||
| 34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
| 35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
| @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
| 37 | 37 | ||
| 38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
| 39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
| 40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
| 41 | ${BSPDIR}/sources/meta-intel \ | 41 | ${BSPDIR}/sources/meta-intel \ |
| 42 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 42 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
| 43 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | 43 | ${BSPDIR}/sources/meta-openembedded/meta-python \ |
| @@ -49,7 +49,3 @@ BBLAYERS ?= " \ | |||
| 49 | ${BSPDIR}/sources/meta-mingw \ | 49 | ${BSPDIR}/sources/meta-mingw \ |
| 50 | ${BSPDIR}/sources/meta-qt5 \ | 50 | ${BSPDIR}/sources/meta-qt5 \ |
| 51 | " | 51 | " |
| 52 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
| 53 | ${BSPDIR}/sources/poky/meta \ | ||
| 54 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
| 55 | " | ||
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 @@ | |||
| 27 | ## | 27 | ## |
| 28 | ############################################################################ | 28 | ############################################################################ |
| 29 | 29 | ||
| 30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
| 31 | # changes incompatibly | 31 | # changes incompatibly |
| 32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
| 33 | 33 | ||
| 34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
| 35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
| @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
| 37 | 37 | ||
| 38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
| 39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
| 40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
| 41 | ${BSPDIR}/sources/nvidia-layer/meta-tegra \ | 41 | ${BSPDIR}/sources/nvidia-layer/meta-tegra \ |
| 42 | ${BSPDIR}/sources/nvidia-layer/meta-vib3 \ | 42 | ${BSPDIR}/sources/nvidia-layer/meta-vib3 \ |
| 43 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 43 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
| @@ -51,8 +51,3 @@ BBLAYERS ?= " \ | |||
| 51 | ${BSPDIR}/sources/meta-mingw \ | 51 | ${BSPDIR}/sources/meta-mingw \ |
| 52 | ${BSPDIR}/sources/meta-qt5 \ | 52 | ${BSPDIR}/sources/meta-qt5 \ |
| 53 | " | 53 | " |
| 54 | |||
| 55 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
| 56 | ${BSPDIR}/sources/poky/meta \ | ||
| 57 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
| 58 | " | ||
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 @@ | |||
| 27 | ## | 27 | ## |
| 28 | ############################################################################ | 28 | ############################################################################ |
| 29 | 29 | ||
| 30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
| 31 | # changes incompatibly | 31 | # changes incompatibly |
| 32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
| 33 | 33 | ||
| 34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
| 35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
| @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
| 37 | 37 | ||
| 38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
| 39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
| 40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
| 41 | ${BSPDIR}/sources/nvidia-layer/meta-tegra \ | 41 | ${BSPDIR}/sources/nvidia-layer/meta-tegra \ |
| 42 | ${BSPDIR}/sources/nvidia-layer/meta-vib4 \ | 42 | ${BSPDIR}/sources/nvidia-layer/meta-vib4 \ |
| 43 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 43 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
| @@ -51,8 +51,3 @@ BBLAYERS ?= " \ | |||
| 51 | ${BSPDIR}/sources/meta-mingw \ | 51 | ${BSPDIR}/sources/meta-mingw \ |
| 52 | ${BSPDIR}/sources/meta-qt5 \ | 52 | ${BSPDIR}/sources/meta-qt5 \ |
| 53 | " | 53 | " |
| 54 | |||
| 55 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
| 56 | ${BSPDIR}/sources/poky/meta \ | ||
| 57 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
| 58 | " | ||
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 @@ | |||
| 27 | ## | 27 | ## |
| 28 | ############################################################################ | 28 | ############################################################################ |
| 29 | 29 | ||
| 30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
| 31 | # changes incompatibly | 31 | # changes incompatibly |
| 32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
| 33 | 33 | ||
| 34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
| 35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
| @@ -38,7 +38,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
| 38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
| 39 | ${BSPDIR}/sources/meta-boot2qt \ | 39 | ${BSPDIR}/sources/meta-boot2qt \ |
| 40 | ${BSPDIR}/sources/poky/meta \ | 40 | ${BSPDIR}/sources/poky/meta \ |
| 41 | ${BSPDIR}/sources/poky/meta-yocto \ | 41 | ${BSPDIR}/sources/poky/meta-poky \ |
| 42 | ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \ | 42 | ${BSPDIR}/sources/meta-boot2qt/meta-renesas-extras \ |
| 43 | ${BSPDIR}/sources/meta-fsl-arm \ | 43 | ${BSPDIR}/sources/meta-fsl-arm \ |
| 44 | ${BSPDIR}/sources/meta-renesas \ | 44 | ${BSPDIR}/sources/meta-renesas \ |
| @@ -51,7 +51,3 @@ BBLAYERS ?= " \ | |||
| 51 | ${BSPDIR}/sources/meta-qt5 \ | 51 | ${BSPDIR}/sources/meta-qt5 \ |
| 52 | ${BSPDIR}/sources/meta-mingw \ | 52 | ${BSPDIR}/sources/meta-mingw \ |
| 53 | " | 53 | " |
| 54 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
| 55 | ${BSPDIR}/sources/poky/meta \ | ||
| 56 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
| 57 | " | ||
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 @@ | |||
| 27 | ## | 27 | ## |
| 28 | ############################################################################ | 28 | ############################################################################ |
| 29 | 29 | ||
| 30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
| 31 | # changes incompatibly | 31 | # changes incompatibly |
| 32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
| 33 | 33 | ||
| 34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
| 35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
| @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
| 37 | 37 | ||
| 38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
| 39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
| 40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
| 41 | ${BSPDIR}/sources/meta-raspberrypi \ | 41 | ${BSPDIR}/sources/meta-raspberrypi \ |
| 42 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 42 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
| 43 | ${BSPDIR}/sources/meta-openembedded/meta-python \ | 43 | ${BSPDIR}/sources/meta-openembedded/meta-python \ |
| @@ -49,7 +49,3 @@ BBLAYERS ?= " \ | |||
| 49 | ${BSPDIR}/sources/meta-mingw \ | 49 | ${BSPDIR}/sources/meta-mingw \ |
| 50 | ${BSPDIR}/sources/meta-qt5 \ | 50 | ${BSPDIR}/sources/meta-qt5 \ |
| 51 | " | 51 | " |
| 52 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
| 53 | ${BSPDIR}/sources/poky/meta \ | ||
| 54 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
| 55 | " | ||
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 @@ | |||
| 27 | ## | 27 | ## |
| 28 | ############################################################################ | 28 | ############################################################################ |
| 29 | 29 | ||
| 30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
| 31 | # changes incompatibly | 31 | # changes incompatibly |
| 32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
| 33 | 33 | ||
| 34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
| 35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
| @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
| 37 | 37 | ||
| 38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
| 39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
| 40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
| 41 | ${BSPDIR}/sources/meta-fsl-arm \ | 41 | ${BSPDIR}/sources/meta-fsl-arm \ |
| 42 | ${BSPDIR}/sources/meta-fsl-arm-extra \ | 42 | ${BSPDIR}/sources/meta-fsl-arm-extra \ |
| 43 | ${BSPDIR}/sources/meta-beagleboard/common-bsp \ | 43 | ${BSPDIR}/sources/meta-beagleboard/common-bsp \ |
| @@ -54,7 +54,3 @@ BBLAYERS ?= " \ | |||
| 54 | ${BSPDIR}/sources/meta-mingw \ | 54 | ${BSPDIR}/sources/meta-mingw \ |
| 55 | ${BSPDIR}/sources/meta-qt5 \ | 55 | ${BSPDIR}/sources/meta-qt5 \ |
| 56 | " | 56 | " |
| 57 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
| 58 | ${BSPDIR}/sources/poky/meta \ | ||
| 59 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
| 60 | " | ||
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 @@ | |||
| 27 | ## | 27 | ## |
| 28 | ############################################################################ | 28 | ############################################################################ |
| 29 | 29 | ||
| 30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
| 31 | # changes incompatibly | 31 | # changes incompatibly |
| 32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
| 33 | 33 | ||
| 34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
| 35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
| @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
| 37 | 37 | ||
| 38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
| 39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
| 40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
| 41 | ${BSPDIR}/sources/meta-fsl-arm \ | 41 | ${BSPDIR}/sources/meta-fsl-arm \ |
| 42 | ${BSPDIR}/sources/meta-fsl-arm-extra \ | 42 | ${BSPDIR}/sources/meta-fsl-arm-extra \ |
| 43 | ${BSPDIR}/sources/meta-smx6 \ | 43 | ${BSPDIR}/sources/meta-smx6 \ |
| @@ -52,7 +52,3 @@ BBLAYERS ?= " \ | |||
| 52 | ${BSPDIR}/sources/meta-mingw \ | 52 | ${BSPDIR}/sources/meta-mingw \ |
| 53 | ${BSPDIR}/sources/meta-qt5 \ | 53 | ${BSPDIR}/sources/meta-qt5 \ |
| 54 | " | 54 | " |
| 55 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
| 56 | ${BSPDIR}/sources/poky/meta \ | ||
| 57 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
| 58 | " | ||
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 @@ | |||
| 27 | ## | 27 | ## |
| 28 | ############################################################################ | 28 | ############################################################################ |
| 29 | 29 | ||
| 30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
| 31 | # changes incompatibly | 31 | # changes incompatibly |
| 32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
| 33 | 33 | ||
| 34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
| 35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
| @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
| 37 | 37 | ||
| 38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
| 39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
| 40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
| 41 | ${BSPDIR}/sources/meta-ti \ | 41 | ${BSPDIR}/sources/meta-ti \ |
| 42 | ${BSPDIR}/sources/meta-fsl-arm \ | 42 | ${BSPDIR}/sources/meta-fsl-arm \ |
| 43 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ | 43 | ${BSPDIR}/sources/meta-openembedded/meta-oe \ |
| @@ -50,7 +50,3 @@ BBLAYERS ?= " \ | |||
| 50 | ${BSPDIR}/sources/meta-mingw \ | 50 | ${BSPDIR}/sources/meta-mingw \ |
| 51 | ${BSPDIR}/sources/meta-qt5 \ | 51 | ${BSPDIR}/sources/meta-qt5 \ |
| 52 | " | 52 | " |
| 53 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
| 54 | ${BSPDIR}/sources/poky/meta \ | ||
| 55 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
| 56 | " | ||
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 @@ | |||
| 27 | ## | 27 | ## |
| 28 | ############################################################################ | 28 | ############################################################################ |
| 29 | 29 | ||
| 30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
| 31 | # changes incompatibly | 31 | # changes incompatibly |
| 32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
| 33 | 33 | ||
| 34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
| 35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
| @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
| 37 | 37 | ||
| 38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
| 39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
| 40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
| 41 | ${BSPDIR}/sources/meta-fsl-arm \ | 41 | ${BSPDIR}/sources/meta-fsl-arm \ |
| 42 | ${BSPDIR}/sources/meta-fsl-arm-extra \ | 42 | ${BSPDIR}/sources/meta-fsl-arm-extra \ |
| 43 | ${BSPDIR}/sources/meta-tibidabo \ | 43 | ${BSPDIR}/sources/meta-tibidabo \ |
| @@ -52,7 +52,3 @@ BBLAYERS ?= " \ | |||
| 52 | ${BSPDIR}/sources/meta-mingw \ | 52 | ${BSPDIR}/sources/meta-mingw \ |
| 53 | ${BSPDIR}/sources/meta-qt5 \ | 53 | ${BSPDIR}/sources/meta-qt5 \ |
| 54 | " | 54 | " |
| 55 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
| 56 | ${BSPDIR}/sources/poky/meta \ | ||
| 57 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
| 58 | " | ||
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 @@ | |||
| 27 | ## | 27 | ## |
| 28 | ############################################################################ | 28 | ############################################################################ |
| 29 | 29 | ||
| 30 | # LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf | 30 | # POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf |
| 31 | # changes incompatibly | 31 | # changes incompatibly |
| 32 | LCONF_VERSION = "6" | 32 | POKY_BBLAYERS_CONF_VERSION = "2" |
| 33 | 33 | ||
| 34 | BBPATH = "${TOPDIR}" | 34 | BBPATH = "${TOPDIR}" |
| 35 | BBFILES ?= "" | 35 | BBFILES ?= "" |
| @@ -37,7 +37,7 @@ BSPDIR := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..' | |||
| 37 | 37 | ||
| 38 | BBLAYERS ?= " \ | 38 | BBLAYERS ?= " \ |
| 39 | ${BSPDIR}/sources/poky/meta \ | 39 | ${BSPDIR}/sources/poky/meta \ |
| 40 | ${BSPDIR}/sources/poky/meta-yocto \ | 40 | ${BSPDIR}/sources/poky/meta-poky \ |
| 41 | ${BSPDIR}/sources/meta-toradex \ | 41 | ${BSPDIR}/sources/meta-toradex \ |
| 42 | ${BSPDIR}/sources/meta-fsl-arm \ | 42 | ${BSPDIR}/sources/meta-fsl-arm \ |
| 43 | ${BSPDIR}/sources/meta-fsl-arm-extra \ | 43 | ${BSPDIR}/sources/meta-fsl-arm-extra \ |
| @@ -52,7 +52,3 @@ BBLAYERS ?= " \ | |||
| 52 | ${BSPDIR}/sources/meta-mingw \ | 52 | ${BSPDIR}/sources/meta-mingw \ |
| 53 | ${BSPDIR}/sources/meta-qt5 \ | 53 | ${BSPDIR}/sources/meta-qt5 \ |
| 54 | " | 54 | " |
| 55 | BBLAYERS_NON_REMOVABLE ?= " \ | ||
| 56 | ${BSPDIR}/sources/poky/meta \ | ||
| 57 | ${BSPDIR}/sources/poky/meta-yocto \ | ||
| 58 | " | ||
