summaryrefslogtreecommitdiffstats
path: root/meta-poky
diff options
context:
space:
mode:
Diffstat (limited to 'meta-poky')
-rw-r--r--meta-poky/conf/distro/poky.conf5
-rw-r--r--meta-poky/conf/layer.conf2
2 files changed, 3 insertions, 4 deletions
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
index 5790094ea9..a42e1d4ebb 100644
--- a/meta-poky/conf/distro/poky.conf
+++ b/meta-poky/conf/distro/poky.conf
@@ -1,8 +1,7 @@
1DISTRO = "poky" 1DISTRO = "poky"
2DISTRO_NAME = "Poky (Yocto Project Reference Distro)" 2DISTRO_NAME = "Poky (Yocto Project Reference Distro)"
3#DISTRO_VERSION = "3.4+snapshot-${METADATA_REVISION}" 3DISTRO_VERSION = "4.1+snapshot-${METADATA_REVISION}"
4DISTRO_VERSION = "4.0" 4DISTRO_CODENAME = "langdale"
5DISTRO_CODENAME = "kirkstone"
6SDK_VENDOR = "-pokysdk" 5SDK_VENDOR = "-pokysdk"
7SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}" 6SDK_VERSION = "${@d.getVar('DISTRO_VERSION').replace('snapshot-${METADATA_REVISION}', 'snapshot')}"
8SDK_VERSION[vardepvalue] = "${SDK_VERSION}" 7SDK_VERSION[vardepvalue] = "${SDK_VERSION}"
diff --git a/meta-poky/conf/layer.conf b/meta-poky/conf/layer.conf
index f43c875c2a..357cc803da 100644
--- a/meta-poky/conf/layer.conf
+++ b/meta-poky/conf/layer.conf
@@ -9,7 +9,7 @@ BBFILE_COLLECTIONS += "yocto"
9BBFILE_PATTERN_yocto = "^${LAYERDIR}/" 9BBFILE_PATTERN_yocto = "^${LAYERDIR}/"
10BBFILE_PRIORITY_yocto = "5" 10BBFILE_PRIORITY_yocto = "5"
11 11
12LAYERSERIES_COMPAT_yocto = "kirkstone" 12LAYERSERIES_COMPAT_yocto = "kirkstone langdale"
13 13
14# This should only be incremented on significant changes that will 14# This should only be incremented on significant changes that will
15# cause compatibility issues with other layers 15# cause compatibility issues with other layers