diff --git a/bazel_common/score_modules_target_sw.MODULE.bazel b/bazel_common/score_modules_target_sw.MODULE.bazel index 0319c2ce783..acf0a86a2f2 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 = "9216215f3a8468f3487884b472e1f325ef36f92b", + commit = "ee40fece5abacb28ea641b448446a04175038b17", patch_strip = 1, patches = [ "//patches/baselibs:001-restore-trace-library-mock-visibility.patch", "//patches/baselibs:002-restore-qnx8-poll-workaround.patch", - "//patches/baselibs:006-include-cpp-style-guide-in-toctree.patch", ], remote = "https://github.com/eclipse-score/baselibs.git", ) diff --git a/known_good.json b/known_good.json index 8bfe28a313d..512be20b453 100644 --- a/known_good.json +++ b/known_good.json @@ -5,8 +5,7 @@ "repo": "https://github.com/eclipse-score/baselibs.git", "bazel_patches": [ "//patches/baselibs:001-restore-trace-library-mock-visibility.patch", - "//patches/baselibs:002-restore-qnx8-poll-workaround.patch", - "//patches/baselibs:006-include-cpp-style-guide-in-toctree.patch" + "//patches/baselibs:002-restore-qnx8-poll-workaround.patch" ], "metadata": { "code_root_path": "//score/...", @@ -25,7 +24,7 @@ "cpp" ] }, - "hash": "9216215f3a8468f3487884b472e1f325ef36f92b" + "hash": "ee40fece5abacb28ea641b448446a04175038b17" }, "score_communication": { "repo": "https://github.com/eclipse-score/communication.git", diff --git a/patches/baselibs/006-include-cpp-style-guide-in-toctree.patch b/patches/baselibs/006-include-cpp-style-guide-in-toctree.patch deleted file mode 100644 index bc916546678..00000000000 --- a/patches/baselibs/006-include-cpp-style-guide-in-toctree.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/docs/index.rst b/docs/index.rst -index c2f4a6ef1..c4b8a57c1 100644 ---- a/docs/index.rst -+++ b/docs/index.rst -@@ -56,6 +56,15 @@ The Components documentation provides detailed documentation for each individual - baselibs/components/index - - -+Development Guidelines -+----------------------- -+ -+.. toctree:: -+ :maxdepth: 1 -+ -+ cpp-style-guide -+ -+ - Quick Start - Building and Testing - ---------------------------------- -