diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07ad8bc451238cfb708fb6022e7cfa28212d6cbd..709b17709cb1dc2513230e1d5c666893a6471e2b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,8 +96,8 @@ yamllint: ${PROJECT_ROOT}/tools/xconfig ${PROJECT_ROOT}/tools/qt-multi-screen-compositor ${PROJECT_ROOT}/yocto/config - ${PROJECT_ROOT}/yocto/layers/meta-guf-distro - ${PROJECT_ROOT}/yocto/layers/meta-guf-machine + ${PROJECT_ROOT}/yocto/layers/meta-seconorth-distro + ${PROJECT_ROOT}/yocto/layers/meta-seconorth-machine ${PROJECT_ROOT}/yocto/layers/meta-seconorth-nogplv3 ${PROJECT_ROOT}/yocto/layers/meta-seconorth-dual-espresso diff --git a/docs/automatic-manifest-integration.md b/docs/automatic-manifest-integration.md index a551b3345359c76fc16d0dce1f444c381f8bc20b..5a216ba999a509120ec3f5c8c6afa0723c8166a2 100644 --- a/docs/automatic-manifest-integration.md +++ b/docs/automatic-manifest-integration.md @@ -28,16 +28,16 @@ Yocto distribution. A simplified version of the manifest file [`default.xml`][2] /> <project - name="layers/meta-guf-machine" + name="layers/meta-seconorth-machine" revision="7aede82170ff7f92de0dcfeca89ed79849869214" remote="seco-ne" - path="sources/meta-guf-machine" + path="sources/meta-seconorth-machine" /> <project - name="layers/meta-guf-distro" + name="layers/meta-seconorth-distro" revision="c402d855fc8d47e3742ada3b0a3fda4b9649e414" remote="seco-ne" - path="sources/meta-guf-distro" + path="sources/meta-seconorth-distro" /> </manifest> ``` @@ -112,7 +112,7 @@ successfully. [4]: https://docs.gitlab.com/ee/ci/pipelines/multi_project_pipelines.html [5]: #merging-project-changes -[6]: https://git.seco.com/seco-ne/yocto/layers/meta-guf-distro/-/merge_requests/321 +[6]: https://git.seco.com/seco-ne/yocto/layers/meta-seconorth-distro/-/merge_requests/321 <!-----------------------------------------------------------------------------> diff --git a/get_manifest_projects.py b/get_manifest_projects.py index 994a81c36af67326bd25c357b3640894e4447c06..03e5798ccab83e9a9464f341d447a9a5fd425b16 100755 --- a/get_manifest_projects.py +++ b/get_manifest_projects.py @@ -38,11 +38,11 @@ def main(): # Get namespace from remote # This is needed for cases where the remote URL contains a part of the project # namespace (e.g. "ssh://git@gitlab.com/garz-fricke/yocto") and the project name - # contains another part of it (e.g. "layers/meta-guf-machine"). There is no GitLab - # API call which will find a project given this information. + # contains another part of it (e.g. "layers/meta-seconorth-machine"). There is no + # GitLab API call which will find a project given this information. # Thus we are adding a possibility to parse the namespace from the remote and pre- # pend it to the project name in order to return it including its complete namespace - # (e.g. "garz-fricke/yocto/layers/meta-guf-machine"). + # (e.g. "garz-fricke/yocto/layers/meta-seconorth-machine"). if args.concat_namespaces: remote = manifest.find("remote[@name='%s']" % args.remote) if remote is None: