From ea99def6bff9bc4a24df4730eabefc7dc1d62f27 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Tue, 19 Apr 2022 19:07:24 +0200 Subject: 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 (From yocto-docs rev: 18338292d99ed236e2bac6e73a5152ef11c4a9e5) Signed-off-by: Quentin Schulz Signed-off-by: Richard Purdie --- documentation/set_versions.py | 2 +- documentation/sphinx-static/switchers.js.in | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'documentation') 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: 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 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 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 { -- cgit v1.2.3-54-g00ecf