From 3980c08e8dd6b8bd0dab203f9549e38632465ea9 Mon Sep 17 00:00:00 2001 From: Anton Krivoborodov Date: Wed, 23 Sep 2026 09:03:26 +0000 Subject: [PATCH 1/2] chore: update baselibs to latest main, drop rename-manual-verification-report patch Baselibs eclipse-score/baselibs#618 fixed the module_verification_report post_template to include all components and switched baselibs' own docs/verification_report/module_verification_report.rst to generate its report via the shared module_verification_report post_template, keeping the id doc__baselibs_verification_report (the template derives the module id by stripping doc__/_verification_report from the need's own id, so this id is now load-bearing). patches/baselibs/005-rename-manual-verification-report-id.patch is no longer compatible with that: reapplying it would rename the id to doc__baselibs_manual_verification_report, which the template would then misparse as module id baselibs_manual, producing an empty report. - Bump score_baselibs known_good pin to 9216215f3a8468f3487884b472e1f325ef36f92b (main after #618). - Drop patch 005 from known_good.json and regenerate bazel_common/score_modules_target_sw.MODULE.bazel. - Simplify docs/verification_report/modules/baselibs/baselibs_verification_report.rst: it no longer redeclares a document with the (now colliding) id, it just links to the report baselibs itself contributes via its docs bundle mount. - Refresh MODULE.bazel.lock via 'bazel mod deps --lockfile_mode=update'. --- MODULE.bazel.lock | 2 ++ .../score_modules_target_sw.MODULE.bazel | 3 +-- .../baselibs/baselibs_verification_report.rst | 18 ++++---------- known_good.json | 3 +-- ...rename-manual-verification-report-id.patch | 24 ------------------- 5 files changed, 9 insertions(+), 41 deletions(-) delete mode 100644 patches/baselibs/005-rename-manual-verification-report-id.patch diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index e6ef672d947..506d90de807 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -215,6 +215,7 @@ "https://bcr.bazel.build/modules/buildifier_prebuilt/6.1.2/MODULE.bazel": "2ef4962c8b0b6d8d21928a89190755619254459bc67f870dc0ccb9ba9952d444", "https://bcr.bazel.build/modules/buildifier_prebuilt/6.4.0/MODULE.bazel": "37389c6b5a40c59410b4226d3bb54b08637f393d66e2fa57925c6fcf68e64bf4", "https://bcr.bazel.build/modules/buildifier_prebuilt/7.3.1/MODULE.bazel": "537faf0ad9f5892910074b8e43b4c91c96f1d5d86b6ed04bdbe40cf68aa48b68", + "https://bcr.bazel.build/modules/buildifier_prebuilt/8.2.0.2/MODULE.bazel": "a9b689711d5b69f9db741649b218c119b9fdf82924ba390415037e09798edd03", "https://bcr.bazel.build/modules/buildifier_prebuilt/8.5.1/MODULE.bazel": "77f2a1958d1d07376dd3ce3ae16540f2c1b01921c1fd21930827271260e75a66", "https://bcr.bazel.build/modules/buildifier_prebuilt/8.5.1/source.json": "ae9f3d9dc7bec033976cf47165a78788bebad2b5c272241063ae31bad8664fd4", "https://bcr.bazel.build/modules/buildozer/7.1.2/MODULE.bazel": "2e8dd40ede9c454042645fd8d8d0cd1527966aa5c919de86661e62953cd73d84", @@ -742,6 +743,7 @@ "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildifier_prebuilt/6.1.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildifier_prebuilt/6.4.0/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildifier_prebuilt/7.3.1/MODULE.bazel": "not found", + "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildifier_prebuilt/8.2.0.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildifier_prebuilt/8.5.1/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/buildozer/7.1.2/MODULE.bazel": "not found", "https://raw.githubusercontent.com/eclipse-score/bazel_registry/main/modules/bzip2/1.0.8.bcr.3/MODULE.bazel": "not found", diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 96c595bd41f..7d431dec9ae 100644 --- a/bazel_common/score_modules_target_sw.MODULE.bazel +++ b/bazel_common/score_modules_target_sw.MODULE.bazel @@ -17,12 +17,11 @@ bazel_dep(name = "score_baselibs") git_override( module_name = "score_baselibs", - commit = "8f58bd34fb5218ddd909f87cadc3d7f17ca38ef7", + commit = "9216215f3a8468f3487884b472e1f325ef36f92b", patch_strip = 1, patches = [ "//patches/baselibs:001-restore-trace-library-mock-visibility.patch", "//patches/baselibs:002-restore-qnx8-poll-workaround.patch", - "//patches/baselibs:005-rename-manual-verification-report-id.patch", "//patches/baselibs:006-include-cpp-style-guide-in-toctree.patch", ], remote = "https://github.com/eclipse-score/baselibs.git", diff --git a/docs/verification_report/modules/baselibs/baselibs_verification_report.rst b/docs/verification_report/modules/baselibs/baselibs_verification_report.rst index 2769de2e0e7..3ed63add0df 100644 --- a/docs/verification_report/modules/baselibs/baselibs_verification_report.rst +++ b/docs/verification_report/modules/baselibs/baselibs_verification_report.rst @@ -15,17 +15,9 @@ Baselibs Module Verification Report ==================================== -.. document:: Baselibs Module Verification Report - :id: doc__baselibs_verification_report - :post_template: module_verification_report - :status: valid - :safety: QM - :security: NO - :realizes: wp__verification_module_ver_report - :report_version: v1.0 - :version: 1 +Baselibs generates its own module verification report directly from its own +needs data, using the module verification report template introduced by +docs-as-code: :need:`doc__baselibs_verification_report`. -This report is generated from baselibs' own needs data. -It uses the module verification report template introduced by docs-as-code. -It complements baselibs' own hand-written verification report, -:need:`doc__baselibs_manual_verification_report`. +See :doc:`/modules/score_baselibs/verification_report/module_verification_report` +for the full report. diff --git a/known_good.json b/known_good.json index d10ac415a09..763eaf82e54 100644 --- a/known_good.json +++ b/known_good.json @@ -6,7 +6,6 @@ "bazel_patches": [ "//patches/baselibs:001-restore-trace-library-mock-visibility.patch", "//patches/baselibs:002-restore-qnx8-poll-workaround.patch", - "//patches/baselibs:005-rename-manual-verification-report-id.patch", "//patches/baselibs:006-include-cpp-style-guide-in-toctree.patch" ], "metadata": { @@ -26,7 +25,7 @@ "cpp" ] }, - "hash": "8f58bd34fb5218ddd909f87cadc3d7f17ca38ef7" + "hash": "9216215f3a8468f3487884b472e1f325ef36f92b" }, "score_communication": { "repo": "https://github.com/eclipse-score/communication.git", diff --git a/patches/baselibs/005-rename-manual-verification-report-id.patch b/patches/baselibs/005-rename-manual-verification-report-id.patch deleted file mode 100644 index 6e419260b46..00000000000 --- a/patches/baselibs/005-rename-manual-verification-report-id.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/docs/module/safety_mgt/module_safety_plan.rst b/docs/module/safety_mgt/module_safety_plan.rst ---- a/docs/module/safety_mgt/module_safety_plan.rst -+++ b/docs/module/safety_mgt/module_safety_plan.rst -@@ -109,7 +109,7 @@ Module Work products List - * - :need:`wp__verification_module_ver_report` - - :need:`gd_temp__mod_ver_report` - - :ndf:`copy('status', need_id='gd_temp__mod_ver_report')` -- - :need:`doc__baselibs_verification_report` -+ - :need:`doc__baselibs_manual_verification_report` - - * - :need:`wp__module_sw_release_note` - - :need:`gd_temp__rel_mod_rel_note` -diff --git a/docs/verification_report/module_verification_report.rst b/docs/verification_report/module_verification_report.rst ---- a/docs/verification_report/module_verification_report.rst -+++ b/docs/verification_report/module_verification_report.rst -@@ -18,7 +18,7 @@ Verification Report - .. note:: Document header - - .. document:: Baselibs Verification Report -- :id: doc__baselibs_verification_report -+ :id: doc__baselibs_manual_verification_report - :status: draft - :version: 1 - :safety: ASIL_B From 94fe57a91a4e494a3ec344398bf59f6442f7f676 Mon Sep 17 00:00:00 2001 From: Anton Krivoborodov Date: Wed, 23 Sep 2026 09:19:10 +0000 Subject: [PATCH 2/2] docs(verification_report): link baselibs module report directly, drop wrapper Remove docs/verification_report/modules/baselibs/, which only redeclared a redundant document need. Link modules/index.rst directly to /modules/score_baselibs/verification_report/module_verification_report, the report baselibs itself contributes via its docs bundle mount, so clicking "Baselibs" jumps straight to it instead of an intermediate wrapper page. --- .../baselibs/baselibs_verification_report.rst | 23 ------------------- docs/verification_report/modules/index.rst | 4 ++-- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 docs/verification_report/modules/baselibs/baselibs_verification_report.rst diff --git a/docs/verification_report/modules/baselibs/baselibs_verification_report.rst b/docs/verification_report/modules/baselibs/baselibs_verification_report.rst deleted file mode 100644 index 3ed63add0df..00000000000 --- a/docs/verification_report/modules/baselibs/baselibs_verification_report.rst +++ /dev/null @@ -1,23 +0,0 @@ -.. - # ******************************************************************************* - # Copyright (c) 2026 Contributors to the Eclipse Foundation - # - # See the NOTICE file(s) distributed with this work for additional - # information regarding copyright ownership. - # - # This program and the accompanying materials are made available under the - # terms of the Apache License Version 2.0 which is available at - # https://www.apache.org/licenses/LICENSE-2.0 - # - # SPDX-License-Identifier: Apache-2.0 - # ******************************************************************************* - -Baselibs Module Verification Report -==================================== - -Baselibs generates its own module verification report directly from its own -needs data, using the module verification report template introduced by -docs-as-code: :need:`doc__baselibs_verification_report`. - -See :doc:`/modules/score_baselibs/verification_report/module_verification_report` -for the full report. diff --git a/docs/verification_report/modules/index.rst b/docs/verification_report/modules/index.rst index 72f6777a712..0f4468033f8 100644 --- a/docs/verification_report/modules/index.rst +++ b/docs/verification_report/modules/index.rst @@ -19,12 +19,12 @@ This page lists the per-module verification reports, each generated from the respective module's own needs data using the module verification report template introduced by docs-as-code. -* :doc:`Baselibs ` +* :doc:`Baselibs ` * :doc:`Persistency ` .. toctree:: :titlesonly: :hidden: - Baselibs + Baselibs Persistency