summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--documentation/poky.yaml.in12
-rwxr-xr-xdocumentation/set_versions.py6
2 files changed, 10 insertions, 8 deletions
diff --git a/documentation/poky.yaml.in b/documentation/poky.yaml.in
index 1c072c1d05..b2b6a6330f 100644
--- a/documentation/poky.yaml.in
+++ b/documentation/poky.yaml.in
@@ -1,10 +1,10 @@
1DISTRO : "4.1" 1DISTRO : "4.2"
2DISTRO_NAME_NO_CAP : "langdale" 2DISTRO_NAME_NO_CAP : "mickledore"
3DISTRO_NAME : "Langdale" 3DISTRO_NAME : "Mickledore"
4DISTRO_NAME_NO_CAP_MINUS_ONE : "kirkstone" 4DISTRO_NAME_NO_CAP_MINUS_ONE : "langdale"
5DISTRO_NAME_NO_CAP_LTS : "kirkstone" 5DISTRO_NAME_NO_CAP_LTS : "kirkstone"
6YOCTO_DOC_VERSION : "4.1" 6YOCTO_DOC_VERSION : "4.2"
7DISTRO_REL_TAG : "yocto-4.1" 7DISTRO_REL_TAG : "yocto-4.2"
8DOCCONF_VERSION : "dev" 8DOCCONF_VERSION : "dev"
9BITBAKE_SERIES : "" 9BITBAKE_SERIES : ""
10YOCTO_DL_URL : "https://downloads.yoctoproject.org" 10YOCTO_DL_URL : "https://downloads.yoctoproject.org"
diff --git a/documentation/set_versions.py b/documentation/set_versions.py
index efaebe43b5..354dabe618 100755
--- a/documentation/set_versions.py
+++ b/documentation/set_versions.py
@@ -26,8 +26,8 @@ ourversion = None
26if len(sys.argv) == 2: 26if len(sys.argv) == 2:
27 ourversion = sys.argv[1] 27 ourversion = sys.argv[1]
28 28
29activereleases = ["langdale", "kirkstone", "dunfell"] 29activereleases = ["mickledore", "kirkstone", "dunfell"]
30devbranch = "mickledore" 30devbranch = "nanbield"
31ltsseries = ["kirkstone", "dunfell"] 31ltsseries = ["kirkstone", "dunfell"]
32 32
33# used by run-docs-builds to get the default page 33# used by run-docs-builds to get the default page
@@ -36,6 +36,7 @@ if ourversion == "getlatest":
36 sys.exit(0) 36 sys.exit(0)
37 37
38release_series = collections.OrderedDict() 38release_series = collections.OrderedDict()
39release_series["nanbield"] = "4.3"
39release_series["mickledore"] = "4.2" 40release_series["mickledore"] = "4.2"
40release_series["langdale"] = "4.1" 41release_series["langdale"] = "4.1"
41release_series["kirkstone"] = "4.0" 42release_series["kirkstone"] = "4.0"
@@ -66,6 +67,7 @@ release_series["laverne"] = "0.9"
66 67
67 68
68bitbake_mapping = { 69bitbake_mapping = {
70 "nanbield" : "2.6",
69 "mickledore" : "2.4", 71 "mickledore" : "2.4",
70 "langdale" : "2.2", 72 "langdale" : "2.2",
71 "kirkstone" : "2.0", 73 "kirkstone" : "2.0",