diff options
author | Quentin Schulz <quentin.schulz@theobroma-systems.com> | 2022-04-19 19:07:24 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-25 15:22:12 +0100 |
commit | ea99def6bff9bc4a24df4730eabefc7dc1d62f27 (patch) | |
tree | 875645e00f4bec8af154a6eedae0e5f5f2b2f5d8 | |
parent | ee6d170d87ee38c6abbba2e800853d98395cdf93 (diff) | |
download | poky-ea99def6bff9bc4a24df4730eabefc7dc1d62f27.tar.gz |
docs: update Bitbake objects.inv location for master branch
master branch of Bitbake is now located at docs.yoctoproject.org/dev
instead of docs.yoctoproject.org so let's update the switchers and
set_versions.py to reflect that change.
Cc: Quentin Schulz <foss+yocto@0leil.net>
(From yocto-docs rev: 18338292d99ed236e2bac6e73a5152ef11c4a9e5)
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | documentation/set_versions.py | 2 | ||||
-rw-r--r-- | documentation/sphinx-static/switchers.js.in | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/documentation/set_versions.py b/documentation/set_versions.py index 8ae02b11f9..0086e9bea3 100755 --- a/documentation/set_versions.py +++ b/documentation/set_versions.py | |||
@@ -128,7 +128,7 @@ else: | |||
128 | if branch == "master": | 128 | if branch == "master": |
129 | ourseries = devbranch | 129 | ourseries = devbranch |
130 | docconfver = "dev" | 130 | docconfver = "dev" |
131 | bitbakeversion = "" | 131 | bitbakeversion = "dev" |
132 | elif branch in release_series: | 132 | elif branch in release_series: |
133 | ourseries = branch | 133 | ourseries = branch |
134 | if branch in bitbake_mapping: | 134 | if branch in bitbake_mapping: |
diff --git a/documentation/sphinx-static/switchers.js.in b/documentation/sphinx-static/switchers.js.in index 408e23a71c..4966b3033d 100644 --- a/documentation/sphinx-static/switchers.js.in +++ b/documentation/sphinx-static/switchers.js.in | |||
@@ -149,11 +149,9 @@ by https://git.yoctoproject.org/yocto-autobuilder-helper/tree/scripts/run-docs-b | |||
149 | var docroot = get_docroot_url() | 149 | var docroot = get_docroot_url() |
150 | 150 | ||
151 | var new_versionpath = selected_version + '/'; | 151 | var new_versionpath = selected_version + '/'; |
152 | if (selected_version == "dev") | ||
153 | new_versionpath = ''; | ||
154 | 152 | ||
155 | // dev versions have no version prefix | 153 | // latest tag is also the default page (without version information) |
156 | if (current_version == "dev") { | 154 | if (docroot.endsWith(current_version + '/') == false) { |
157 | var new_url = docroot + new_versionpath + url.replace(docroot, ""); | 155 | var new_url = docroot + new_versionpath + url.replace(docroot, ""); |
158 | var fallback_url = docroot + new_versionpath; | 156 | var fallback_url = docroot + new_versionpath; |
159 | } else { | 157 | } else { |