[RFC PATCH] docs: update Bitbake objects.inv location for master branch


Quentin Schulz
 

From: Quentin Schulz <quentin.schulz@...>

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@...>
Signed-off-by: Quentin Schulz <quentin.schulz@...>
---
documentation/set_versions.py | 2 +-
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 8ae02b11f..0086e9bea 100755
--- a/documentation/set_versions.py
+++ b/documentation/set_versions.py
@@ -128,7 +128,7 @@ else:
if branch == "master":
ourseries = devbranch
docconfver = "dev"
- bitbakeversion = ""
+ bitbakeversion = "dev"
elif branch in release_series:
ourseries = branch
if branch in bitbake_mapping:
diff --git a/documentation/sphinx-static/switchers.js.in b/documentation/sphinx-static/switchers.js.in
index 408e23a71..4966b3033 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
var docroot = get_docroot_url()

var new_versionpath = selected_version + '/';
- if (selected_version == "dev")
- new_versionpath = '';

- // dev versions have no version prefix
- if (current_version == "dev") {
+ // latest tag is also the default page (without version information)
+ if (docroot.endsWith(current_version + '/') == false) {
var new_url = docroot + new_versionpath + url.replace(docroot, "");
var fallback_url = docroot + new_versionpath;
} else {
--
2.35.1

Join {yocto@lists.yoctoproject.org to automatically receive all group messages.