From patchwork Tue Mar 15 16:31:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 5301 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90B37C433FE for ; Tue, 15 Mar 2022 16:31:38 +0000 (UTC) Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by mx.groups.io with SMTP id smtpd.web10.13420.1647361897208822085 for ; Tue, 15 Mar 2022 09:31:37 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: 0leil.net, ip: 217.70.178.230, mailfrom: foss+yocto@0leil.net) Received: (Authenticated sender: foss@0leil.net) by mail.gandi.net (Postfix) with ESMTPSA id 7A863240006; Tue, 15 Mar 2022 16:31:34 +0000 (UTC) From: Quentin Schulz To: yocto@lists.yoctoproject.org Cc: Quentin Schulz , Quentin Schulz Subject: [PATCH yocto-autobuilder-helper 1/4] scripts: run-docs-build: simplify patching logic Date: Tue, 15 Mar 2022 17:31:12 +0100 Message-Id: <20220315163115.2186540-1-foss+yocto@0leil.net> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Mar 2022 16:31:38 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/56448 From: Quentin Schulz There's no need to keep a list of tags requiring to be patched since the tag is part of the path where patches are stored. Therefore, let's only check if there's a patch directory for a given tag and if so, apply all patches in there. Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- scripts/run-docs-build | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/run-docs-build b/scripts/run-docs-build index cca4e4d..73cba3f 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -111,11 +111,7 @@ for tag in $(git tag --list 'yocto-*'); do echo Processing $tag cd $ypdocs git checkout $tag - # Update versions tagged before the current_version in - # conf.py was changed resulting in sphinx believing these are - # development branches which breaks all sorts of assumptions. Moving a - # tag isn't best practice so we just patch the releases here instead. - if [ "$tag" = "yocto-3.3" ] || [ "$tag" = "yocto-3.3.5" ] || [ "$tag" = "yocto-3.4" ] || [ "$tag" = "yocto-3.1.14" ] || [ "$tag" = "yocto-3.4.2" ] ; then + if [ -e "${scriptdir}/docs-build-patches/${tag}/" ]; then echo Adding patch for $tag git am "${scriptdir}/docs-build-patches/${tag}/"000* fi From patchwork Tue Mar 15 16:31:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 5302 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73D0FC433EF for ; Tue, 15 Mar 2022 16:31:38 +0000 (UTC) Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by mx.groups.io with SMTP id smtpd.web11.13344.1647361897211289738 for ; Tue, 15 Mar 2022 09:31:37 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: 0leil.net, ip: 217.70.178.230, mailfrom: foss+yocto@0leil.net) Received: (Authenticated sender: foss@0leil.net) by mail.gandi.net (Postfix) with ESMTPSA id 5302324000B; Tue, 15 Mar 2022 16:31:35 +0000 (UTC) From: Quentin Schulz To: yocto@lists.yoctoproject.org Cc: Quentin Schulz , Quentin Schulz Subject: [PATCH yocto-autobuilder-helper 2/4] scripts: docs-build-patches: fix bitbake objects.inv being used Date: Tue, 15 Mar 2022 17:31:13 +0100 Message-Id: <20220315163115.2186540-2-foss+yocto@0leil.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220315163115.2186540-1-foss+yocto@0leil.net> References: <20220315163115.2186540-1-foss+yocto@0leil.net> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Mar 2022 16:31:38 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/56449 From: Quentin Schulz Each Yocto Project release is validated for a specific Bitbake release. By mistake, most release docs are pointing at the development branch of Bitbake documentation instead of the one that was validated for the Yocto Project release. This fixes the issue by patching the conf.py of impacted releases. Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- ...nf.py-fix-version-of-bitbake-objects.patch | 40 +++++++++++++++++++ ...nf.py-fix-version-of-bitbake-objects.patch | 40 +++++++++++++++++++ ...nf.py-fix-version-of-bitbake-objects.patch | 40 +++++++++++++++++++ ...nf.py-fix-version-of-bitbake-objects.patch | 38 ++++++++++++++++++ ...nf.py-fix-version-of-bitbake-objects.patch | 40 +++++++++++++++++++ ...nf.py-fix-version-of-bitbake-objects.patch | 38 ++++++++++++++++++ ...nf.py-fix-version-of-bitbake-objects.patch | 38 ++++++++++++++++++ 7 files changed, 274 insertions(+) create mode 100644 scripts/docs-build-patches/yocto-3.3.1/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch create mode 100644 scripts/docs-build-patches/yocto-3.3.2/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch create mode 100644 scripts/docs-build-patches/yocto-3.3.3/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch create mode 100644 scripts/docs-build-patches/yocto-3.3.4/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch create mode 100644 scripts/docs-build-patches/yocto-3.3/0002-documentation-conf.py-fix-version-of-bitbake-objects.patch create mode 100644 scripts/docs-build-patches/yocto-3.4.1/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch create mode 100644 scripts/docs-build-patches/yocto-3.4/0002-documentation-conf.py-fix-version-of-bitbake-objects.patch diff --git a/scripts/docs-build-patches/yocto-3.3.1/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch b/scripts/docs-build-patches/yocto-3.3.1/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch new file mode 100644 index 0000000..1842ebe --- /dev/null +++ b/scripts/docs-build-patches/yocto-3.3.1/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch @@ -0,0 +1,40 @@ +From 79e90a28ef7f591b1b9b4c41ef7f353bcf17679f Mon Sep 17 00:00:00 2001 +From: Michael Opdenacker +Date: Wed, 8 Dec 2021 17:17:25 +0100 +Subject: [PATCH] documentation: conf.py: fix version of bitbake objects.inv + +Using the Bitbake 1.50 references instead of the master ones, +which may break if some variables or sections are removed. + +Signed-off-by: Michael Opdenacker +Reported-by: Quentin Schulz +[adapted from commit 79e90a28ef7f591b1b9b4c41ef7f353bcf17679f "documentation: conf.py: fix version of bitbake objects.inv"] +Signed-off-by: Quentin Schulz +--- + documentation/conf.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/documentation/conf.py b/documentation/conf.py +index 28af37d7b..e42e7b18a 100644 +--- a/documentation/conf.py ++++ b/documentation/conf.py +@@ -17,6 +17,7 @@ import sys + import datetime + + current_version = "3.3.1" ++bitbake_version = "1.50" + + # String used in sidebar + version = 'Version: ' + current_version +@@ -89,7 +90,7 @@ extlinks = { + + # Intersphinx config to use cross reference with Bitbake user manual + intersphinx_mapping = { +- 'bitbake': ('https://docs.yoctoproject.org/bitbake/', None) ++ 'bitbake': ('https://docs.yoctoproject.org/bitbake/' + bitbake_version, None) + } + + # -- Options for HTML output ------------------------------------------------- +-- +2.35.1 + diff --git a/scripts/docs-build-patches/yocto-3.3.2/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch b/scripts/docs-build-patches/yocto-3.3.2/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch new file mode 100644 index 0000000..036095f --- /dev/null +++ b/scripts/docs-build-patches/yocto-3.3.2/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch @@ -0,0 +1,40 @@ +From 79e90a28ef7f591b1b9b4c41ef7f353bcf17679f Mon Sep 17 00:00:00 2001 +From: Michael Opdenacker +Date: Wed, 8 Dec 2021 17:17:25 +0100 +Subject: [PATCH] documentation: conf.py: fix version of bitbake objects.inv + +Using the Bitbake 1.50 references instead of the master ones, +which may break if some variables or sections are removed. + +Signed-off-by: Michael Opdenacker +Reported-by: Quentin Schulz +[adapted from commit 79e90a28ef7f591b1b9b4c41ef7f353bcf17679f "documentation: conf.py: fix version of bitbake objects.inv"] +Signed-off-by: Quentin Schulz +--- + documentation/conf.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/documentation/conf.py b/documentation/conf.py +index 28af37d7b..e42e7b18a 100644 +--- a/documentation/conf.py ++++ b/documentation/conf.py +@@ -17,6 +17,7 @@ import sys + import datetime + + current_version = "3.3.2" ++bitbake_version = "1.50" + + # String used in sidebar + version = 'Version: ' + current_version +@@ -89,7 +90,7 @@ extlinks = { + + # Intersphinx config to use cross reference with Bitbake user manual + intersphinx_mapping = { +- 'bitbake': ('https://docs.yoctoproject.org/bitbake/', None) ++ 'bitbake': ('https://docs.yoctoproject.org/bitbake/' + bitbake_version, None) + } + + # -- Options for HTML output ------------------------------------------------- +-- +2.35.1 + diff --git a/scripts/docs-build-patches/yocto-3.3.3/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch b/scripts/docs-build-patches/yocto-3.3.3/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch new file mode 100644 index 0000000..5b11408 --- /dev/null +++ b/scripts/docs-build-patches/yocto-3.3.3/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch @@ -0,0 +1,40 @@ +From 79e90a28ef7f591b1b9b4c41ef7f353bcf17679f Mon Sep 17 00:00:00 2001 +From: Michael Opdenacker +Date: Wed, 8 Dec 2021 17:17:25 +0100 +Subject: [PATCH] documentation: conf.py: fix version of bitbake objects.inv + +Using the Bitbake 1.50 references instead of the master ones, +which may break if some variables or sections are removed. + +Signed-off-by: Michael Opdenacker +Reported-by: Quentin Schulz +[adapted from commit 79e90a28ef7f591b1b9b4c41ef7f353bcf17679f "documentation: conf.py: fix version of bitbake objects.inv"] +Signed-off-by: Quentin Schulz +--- + documentation/conf.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/documentation/conf.py b/documentation/conf.py +index 28af37d7b..e42e7b18a 100644 +--- a/documentation/conf.py ++++ b/documentation/conf.py +@@ -17,6 +17,7 @@ import sys + import datetime + + current_version = "3.3.3" ++bitbake_version = "1.50" + + # String used in sidebar + version = 'Version: ' + current_version +@@ -89,7 +90,7 @@ extlinks = { + + # Intersphinx config to use cross reference with Bitbake user manual + intersphinx_mapping = { +- 'bitbake': ('https://docs.yoctoproject.org/bitbake/', None) ++ 'bitbake': ('https://docs.yoctoproject.org/bitbake/' + bitbake_version, None) + } + + # -- Options for HTML output ------------------------------------------------- +-- +2.35.1 + diff --git a/scripts/docs-build-patches/yocto-3.3.4/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch b/scripts/docs-build-patches/yocto-3.3.4/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch new file mode 100644 index 0000000..ed54e9b --- /dev/null +++ b/scripts/docs-build-patches/yocto-3.3.4/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch @@ -0,0 +1,38 @@ +From 79e90a28ef7f591b1b9b4c41ef7f353bcf17679f Mon Sep 17 00:00:00 2001 +From: Michael Opdenacker +Date: Wed, 8 Dec 2021 17:17:25 +0100 +Subject: [PATCH] documentation: conf.py: fix version of bitbake objects.inv + +Using the Bitbake 1.50 references instead of the master ones, +which may break if some variables or sections are removed. + +Signed-off-by: Michael Opdenacker +Reported-by: Quentin Schulz +--- + documentation/conf.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/documentation/conf.py b/documentation/conf.py +index 28af37d7b..e42e7b18a 100644 +--- a/documentation/conf.py ++++ b/documentation/conf.py +@@ -17,6 +17,7 @@ import sys + import datetime + + current_version = "3.3.4" ++bitbake_version = "1.50" + + # String used in sidebar + version = 'Version: ' + current_version +@@ -89,7 +90,7 @@ extlinks = { + + # Intersphinx config to use cross reference with Bitbake user manual + intersphinx_mapping = { +- 'bitbake': ('https://docs.yoctoproject.org/bitbake/', None) ++ 'bitbake': ('https://docs.yoctoproject.org/bitbake/' + bitbake_version, None) + } + + # -- Options for HTML output ------------------------------------------------- +-- +2.35.1 + diff --git a/scripts/docs-build-patches/yocto-3.3/0002-documentation-conf.py-fix-version-of-bitbake-objects.patch b/scripts/docs-build-patches/yocto-3.3/0002-documentation-conf.py-fix-version-of-bitbake-objects.patch new file mode 100644 index 0000000..cc162c4 --- /dev/null +++ b/scripts/docs-build-patches/yocto-3.3/0002-documentation-conf.py-fix-version-of-bitbake-objects.patch @@ -0,0 +1,40 @@ +From 79e90a28ef7f591b1b9b4c41ef7f353bcf17679f Mon Sep 17 00:00:00 2001 +From: Michael Opdenacker +Date: Wed, 8 Dec 2021 17:17:25 +0100 +Subject: [PATCH] documentation: conf.py: fix version of bitbake objects.inv + +Using the Bitbake 1.50 references instead of the master ones, +which may break if some variables or sections are removed. + +Signed-off-by: Michael Opdenacker +Reported-by: Quentin Schulz +[adapted from commit 79e90a28ef7f591b1b9b4c41ef7f353bcf17679f "documentation: conf.py: fix version of bitbake objects.inv"] +Signed-off-by: Quentin Schulz +--- + documentation/conf.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/documentation/conf.py b/documentation/conf.py +index 28af37d7b..e42e7b18a 100644 +--- a/documentation/conf.py ++++ b/documentation/conf.py +@@ -17,6 +17,7 @@ import sys + import datetime + + current_version = "3.3" ++bitbake_version = "1.50" + + # String used in sidebar + version = 'Version: ' + current_version +@@ -89,7 +90,7 @@ extlinks = { + + # Intersphinx config to use cross reference with Bitbake user manual + intersphinx_mapping = { +- 'bitbake': ('https://docs.yoctoproject.org/bitbake/', None) ++ 'bitbake': ('https://docs.yoctoproject.org/bitbake/' + bitbake_version, None) + } + + # -- Options for HTML output ------------------------------------------------- +-- +2.35.1 + diff --git a/scripts/docs-build-patches/yocto-3.4.1/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch b/scripts/docs-build-patches/yocto-3.4.1/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch new file mode 100644 index 0000000..386c177 --- /dev/null +++ b/scripts/docs-build-patches/yocto-3.4.1/0001-documentation-conf.py-fix-version-of-bitbake-objects.patch @@ -0,0 +1,38 @@ +From fcb24deb8b3abb8a77a12baa2cdd5ba5aa976f01 Mon Sep 17 00:00:00 2001 +From: Michael Opdenacker +Date: Wed, 8 Dec 2021 17:27:56 +0100 +Subject: [PATCH] documentation: conf.py: fix version of bitbake objects.inv + +Using the Bitbake 1.52 references instead of the master ones, +which may break if some variables or sections are removed. + +Signed-off-by: Michael Opdenacker +Reported-by: Quentin Schulz +--- + documentation/conf.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/documentation/conf.py b/documentation/conf.py +index 104b49ea0..eff758a7b 100644 +--- a/documentation/conf.py ++++ b/documentation/conf.py +@@ -17,6 +17,7 @@ import sys + import datetime + + current_version = "3.4" ++bitbake_version = "1.52" + + # String used in sidebar + version = 'Version: ' + current_version +@@ -90,7 +91,7 @@ extlinks = { + + # Intersphinx config to use cross reference with Bitbake user manual + intersphinx_mapping = { +- 'bitbake': ('https://docs.yoctoproject.org/bitbake/', None) ++ 'bitbake': ('https://docs.yoctoproject.org/bitbake/' + bitbake_version, None) + } + + # Suppress "WARNING: unknown mimetype for ..." +-- +2.35.1 + diff --git a/scripts/docs-build-patches/yocto-3.4/0002-documentation-conf.py-fix-version-of-bitbake-objects.patch b/scripts/docs-build-patches/yocto-3.4/0002-documentation-conf.py-fix-version-of-bitbake-objects.patch new file mode 100644 index 0000000..386c177 --- /dev/null +++ b/scripts/docs-build-patches/yocto-3.4/0002-documentation-conf.py-fix-version-of-bitbake-objects.patch @@ -0,0 +1,38 @@ +From fcb24deb8b3abb8a77a12baa2cdd5ba5aa976f01 Mon Sep 17 00:00:00 2001 +From: Michael Opdenacker +Date: Wed, 8 Dec 2021 17:27:56 +0100 +Subject: [PATCH] documentation: conf.py: fix version of bitbake objects.inv + +Using the Bitbake 1.52 references instead of the master ones, +which may break if some variables or sections are removed. + +Signed-off-by: Michael Opdenacker +Reported-by: Quentin Schulz +--- + documentation/conf.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/documentation/conf.py b/documentation/conf.py +index 104b49ea0..eff758a7b 100644 +--- a/documentation/conf.py ++++ b/documentation/conf.py +@@ -17,6 +17,7 @@ import sys + import datetime + + current_version = "3.4" ++bitbake_version = "1.52" + + # String used in sidebar + version = 'Version: ' + current_version +@@ -90,7 +91,7 @@ extlinks = { + + # Intersphinx config to use cross reference with Bitbake user manual + intersphinx_mapping = { +- 'bitbake': ('https://docs.yoctoproject.org/bitbake/', None) ++ 'bitbake': ('https://docs.yoctoproject.org/bitbake/' + bitbake_version, None) + } + + # Suppress "WARNING: unknown mimetype for ..." +-- +2.35.1 + From patchwork Tue Mar 15 16:31:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 5303 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5BD2CC4332F for ; Tue, 15 Mar 2022 16:31:39 +0000 (UTC) Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by mx.groups.io with SMTP id smtpd.web11.13345.1647361898187566632 for ; Tue, 15 Mar 2022 09:31:38 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: 0leil.net, ip: 217.70.178.230, mailfrom: foss+yocto@0leil.net) Received: (Authenticated sender: foss@0leil.net) by mail.gandi.net (Postfix) with ESMTPSA id 2DF6424000F; Tue, 15 Mar 2022 16:31:35 +0000 (UTC) From: Quentin Schulz To: yocto@lists.yoctoproject.org Cc: Quentin Schulz , Quentin Schulz Subject: [PATCH yocto-autobuilder-helper 3/4] scripts: docs-build-patches: fix incorrect conf.py for yocto-3.4.1 Date: Tue, 15 Mar 2022 17:31:14 +0100 Message-Id: <20220315163115.2186540-3-foss+yocto@0leil.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220315163115.2186540-1-foss+yocto@0leil.net> References: <20220315163115.2186540-1-foss+yocto@0leil.net> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Mar 2022 16:31:39 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/56450 From: Quentin Schulz The patch was missing from yocto-3.4.1 release and only made it to yocto-3.4.2 unfortunately so let's backport it. Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- ...honister-updates-for-recent-releases.patch | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 scripts/docs-build-patches/yocto-3.4.1/0002-honister-updates-for-recent-releases.patch diff --git a/scripts/docs-build-patches/yocto-3.4.1/0002-honister-updates-for-recent-releases.patch b/scripts/docs-build-patches/yocto-3.4.1/0002-honister-updates-for-recent-releases.patch new file mode 100644 index 0000000..4e72db1 --- /dev/null +++ b/scripts/docs-build-patches/yocto-3.4.1/0002-honister-updates-for-recent-releases.patch @@ -0,0 +1,93 @@ +From a6b10a8e2491e284e7faf439fa196605ddf40943 Mon Sep 17 00:00:00 2001 +From: Michael Opdenacker +Date: Mon, 13 Dec 2021 16:17:47 +0100 +Subject: [PATCH] [honister] updates for recent releases + +Signed-off-by: Michael Opdenacker +--- + documentation/conf.py | 2 +- + documentation/poky.yaml | 8 ++++---- + documentation/releases.rst | 8 ++++++++ + documentation/sphinx-static/switchers.js | 4 ++-- + 4 files changed, 15 insertions(+), 7 deletions(-) + +diff --git a/documentation/conf.py b/documentation/conf.py +index eff758a7b..ef369b7f1 100644 +--- a/documentation/conf.py ++++ b/documentation/conf.py +@@ -16,7 +16,7 @@ import os + import sys + import datetime + +-current_version = "3.4" ++current_version = "3.4.1" + bitbake_version = "1.52" + + # String used in sidebar +diff --git a/documentation/poky.yaml b/documentation/poky.yaml +index 392e3bd63..11e209e30 100644 +--- a/documentation/poky.yaml ++++ b/documentation/poky.yaml +@@ -1,12 +1,12 @@ +-DISTRO : "3.4" ++DISTRO : "3.4.1" + DISTRO_NAME_NO_CAP : "honister" + DISTRO_NAME : "Honister" + DISTRO_NAME_NO_CAP_MINUS_ONE : "hardknott" + DISTRO_NAME_NO_CAP_LTS : "dunfell" +-YOCTO_DOC_VERSION : "3.4" ++YOCTO_DOC_VERSION : "3.4.1" + YOCTO_DOC_VERSION_MINUS_ONE : "3.3.4" +-DISTRO_REL_TAG : "yocto-3.4" +-POKYVERSION : "26.0.0" ++DISTRO_REL_TAG : "yocto-3.4.1" ++POKYVERSION : "26.0.1" + YOCTO_POKY : "poky-&DISTRO_NAME_NO_CAP;-&POKYVERSION;" + YOCTO_DL_URL : "https://downloads.yoctoproject.org" + YOCTO_AB_URL : "https://autobuilder.yoctoproject.org" +diff --git a/documentation/releases.rst b/documentation/releases.rst +index a6c9a47b8..16ecbf712 100644 +--- a/documentation/releases.rst ++++ b/documentation/releases.rst +@@ -4,6 +4,13 @@ + Supported Release Manuals + =========================== + ++***************************** ++Release Series 3.4 (honister) ++***************************** ++ ++- :yocto_docs:`3.4 Documentation ` ++- :yocto_docs:`3.4.1 Documentation ` ++ + ****************************** + Release Series 3.3 (hardknott) + ****************************** +@@ -30,6 +37,7 @@ Release Series 3.1 (dunfell) + - :yocto_docs:`3.1.9 Documentation ` + - :yocto_docs:`3.1.10 Documentation ` + - :yocto_docs:`3.1.11 Documentation ` ++- :yocto_docs:`3.1.12 Documentation ` + + ========================== + Outdated Release Manuals +diff --git a/documentation/sphinx-static/switchers.js b/documentation/sphinx-static/switchers.js +index b15f5b3c1..056a8926b 100644 +--- a/documentation/sphinx-static/switchers.js ++++ b/documentation/sphinx-static/switchers.js +@@ -3,10 +3,10 @@ + + var all_versions = { + 'dev': 'dev (3.5)', +- '3.4': '3.4', ++ '3.4.1': '3.4.1', + '3.3.4': '3.3.4', + '3.2.4': '3.2.4', +- '3.1.11': '3.1.11', ++ '3.1.12': '3.1.12', + '3.0.4': '3.0.4', + '2.7.4': '2.7.4', + }; +-- +2.35.1 + From patchwork Tue Mar 15 16:31:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 5304 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56B69C43217 for ; Tue, 15 Mar 2022 16:31:40 +0000 (UTC) Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by mx.groups.io with SMTP id smtpd.web11.13346.1647361899122959917 for ; Tue, 15 Mar 2022 09:31:39 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: 0leil.net, ip: 217.70.178.230, mailfrom: foss+yocto@0leil.net) Received: (Authenticated sender: foss@0leil.net) by mail.gandi.net (Postfix) with ESMTPSA id 391B8240011; Tue, 15 Mar 2022 16:31:36 +0000 (UTC) From: Quentin Schulz To: yocto@lists.yoctoproject.org Cc: Quentin Schulz , Quentin Schulz Subject: [PATCH yocto-autobuilder-helper 4/4] Revert "scripts: run-docs-build: do not turn sphinx warnings into errors" Date: Tue, 15 Mar 2022 17:31:15 +0100 Message-Id: <20220315163115.2186540-4-foss+yocto@0leil.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220315163115.2186540-1-foss+yocto@0leil.net> References: <20220315163115.2186540-1-foss+yocto@0leil.net> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 15 Mar 2022 16:31:40 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/56451 From: Quentin Schulz The patch was meant as a quick temporary work-around to have the docs built and published. Now that releases where -W flag is set (turning warnings into errors) are appropriately patched to make those warnings disappear (on Sphinx v3.2.1 which is the one used on the builder), this patch can be reverted so that next time a warning appears the doc building will fail but will not destroy the doc website (because of commit 6a4e6ef18d1415c719be51c773d7c57cae5549cf "scripts: run-docs-build: make the script fail hard ASAP when there's an error", since rsync will not be run if any error happens before). This reverts commit 931d409b255a85f2217ca093d8391a678ce00ddb. Cc: Quentin Schulz Signed-off-by: Quentin Schulz --- scripts/run-docs-build | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/run-docs-build b/scripts/run-docs-build index 73cba3f..b9b331b 100755 --- a/scripts/run-docs-build +++ b/scripts/run-docs-build @@ -33,14 +33,14 @@ cd $bbdocs echo Building bitbake master branch git checkout master make clean -SPHINXOPTS="-j auto" make publish +make publish mkdir $outputdir/bitbake cp -r ./_build/final/* $outputdir/bitbake git checkout master-next echo Building bitbake master-next branch make clean -SPHINXOPTS="-j auto" make publish +make publish mkdir $outputdir/bitbake/next cp -r ./_build/final/* $outputdir/bitbake/next @@ -55,7 +55,7 @@ for branch in 1.46 1.48 1.50 1.52; do git checkout $branch git checkout master releases.rst make clean - SPHINXOPTS="-j auto" make publish + make publish mkdir $outputdir/bitbake/$branch cp -r ./_build/final/* $outputdir/bitbake/$branch git reset --hard @@ -70,21 +70,21 @@ cd $ypdocs echo Building master branch git checkout master make clean -SPHINXOPTS="-j auto" make publish +make publish cp -r ./_build/final/* $outputdir cd $ypdocs echo Building transition branch git checkout transition make clean -SPHINXOPTS="-j auto" make publish +make publish cp -r ./_build/final/* $outputdir/ cd $ypdocs echo Building master-next branch git checkout master-next make clean -SPHINXOPTS="-j auto" make publish +make publish mkdir $outputdir/next cp -r ./_build/final/* $outputdir/next @@ -96,7 +96,7 @@ for branch in dunfell gatesgarth hardknott honister; do git checkout $branch git checkout master releases.rst make clean - SPHINXOPTS="-j auto" make publish + make publish mkdir $outputdir/$branch cp -r ./_build/final/* $outputdir/$branch git reset --hard @@ -117,7 +117,7 @@ for tag in $(git tag --list 'yocto-*'); do fi git checkout master releases.rst make clean - SPHINXOPTS="-j auto" make publish + make publish version=$(echo $tag | cut -c7-) mkdir $outputdir/$version cp -r ./_build/final/* $outputdir/$version