summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-20 10:33:44 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-20 16:27:13 (GMT)
commit13143ea85a1ab7703825c0673128c05845b96cb5 (patch)
tree101c7254ea721b3cf42eff3e1019270a20b973fa
parent686e2a9f47c1598cf2fb4e4d6b123252d09b92ec (diff)
downloadpoky-gatesgarth.tar.gz
conf.py/poky.yaml: Move version information to poky.yaml and read in conf.pygatesgarth
Merge in the changes from master allowing conf.py to use information from poky.yaml. This allows the head version mapped to X.999 on the website to have the version information displayed clearly and correctly. (From yocto-docs rev: 9dbd3e8726b5eebd067d01973540724ea3e246c4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--documentation/conf.py21
-rw-r--r--documentation/poky.yaml2
2 files changed, 22 insertions, 1 deletions
diff --git a/documentation/conf.py b/documentation/conf.py
index 1efd63c..fe27e3e 100644
--- a/documentation/conf.py
+++ b/documentation/conf.py
@@ -15,8 +15,27 @@
15import os 15import os
16import sys 16import sys
17import datetime 17import datetime
18try:
19 import yaml
20except ImportError:
21 sys.stderr.write("The Yocto Project Sphinx documentation requires PyYAML.\
22 \nPlease make sure to install pyyaml python package.\n")
23 sys.exit(1)
18 24
19current_version = "3.2.4" 25# current_version = "dev"
26# bitbake_version = "" # Leave empty for development branch
27# Obtain versions from poky.yaml instead
28with open("poky.yaml") as data:
29 buff = data.read()
30 subst_vars = yaml.safe_load(buff)
31 if "DOCCONF_VERSION" not in subst_vars:
32 sys.stderr.write("Please set DOCCONF_VERSION in poky.yaml")
33 sys.exit(1)
34 current_version = subst_vars["DOCCONF_VERSION"]
35 if "BITBAKE_SERIES" not in subst_vars:
36 sys.stderr.write("Please set BITBAKE_SERIES in poky.yaml")
37 sys.exit(1)
38 bitbake_version = subst_vars["BITBAKE_SERIES"]
20 39
21# String used in sidebar 40# String used in sidebar
22version = 'Version: ' + current_version 41version = 'Version: ' + current_version
diff --git a/documentation/poky.yaml b/documentation/poky.yaml
index 189f7be..fb567a1 100644
--- a/documentation/poky.yaml
+++ b/documentation/poky.yaml
@@ -5,6 +5,8 @@ DISTRO_NAME_NO_CAP_MINUS_ONE : "dunfell"
5YOCTO_DOC_VERSION : "3.2.4" 5YOCTO_DOC_VERSION : "3.2.4"
6YOCTO_DOC_VERSION_MINUS_ONE : "3.1.7" 6YOCTO_DOC_VERSION_MINUS_ONE : "3.1.7"
7DISTRO_REL_TAG : "yocto-3.2.4" 7DISTRO_REL_TAG : "yocto-3.2.4"
8DOCCONF_VERSION : "3.2.4"
9BITBAKE_SERIES : "1.48"
8POKYVERSION : "24.0.4" 10POKYVERSION : "24.0.4"
9YOCTO_POKY : "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;" 11YOCTO_POKY : "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;"
10YOCTO_DL_URL : "https://downloads.yoctoproject.org" 12YOCTO_DL_URL : "https://downloads.yoctoproject.org"