From 389d1172b27900328b5cf783d47e64a7f7efd6b3 Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@huawei.com>
Date: Tue, 12 Apr 2022 11:44:14 +0200
Subject: [PATCH] docs: Migrate all booting references to the EF ones
This also includes a set of additional small tweaks:
1. formatting and small rewarding
2. explicitly use the kitkstone branch for repo init (this avoids
confusion and also saves us from repo edge cases where the default one
is ignored)
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
---
docs/ci/hidden-jobs/workspace.rst | 2 +-
docs/hardware-support/adding-hardware-support.rst | 10 ++++++----
docs/oniro-quick-build.rst | 2 +-
docs/os/linux/partition-table.rst | 4 ++--
docs/repo-workspace.rst | 4 ++--
docs/yocto-build-system/yocto-project.rst | 4 ++--
meta-oniro-core/README.md | 7 ++++---
meta-oniro-staging/README.md | 7 ++++---
8 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/docs/ci/hidden-jobs/workspace.rst b/docs/ci/hidden-jobs/workspace.rst
index 6918033c..0e61470a 100644
--- a/docs/ci/hidden-jobs/workspace.rst
+++ b/docs/ci/hidden-jobs/workspace.rst
@@ -57,7 +57,7 @@ CI_ONIRO_MANIFEST_URL
The URL consumed by git-repo. You only want to change this if you forked the
entire infrastructure and want to use it in private.
-The default value is ``https://booting.oniroproject.org/distro/oniro``.
+The default value is ``https://gitlab.eclipse.org/eclipse/oniro-core/oniro``.
If you change the default value, please set ``CI_ONIRO_MANIFEST_MIRROR``
as well.
diff --git a/docs/hardware-support/adding-hardware-support.rst b/docs/hardware-support/adding-hardware-support.rst
index 66b83c25..7844c168 100644
--- a/docs/hardware-support/adding-hardware-support.rst
+++ b/docs/hardware-support/adding-hardware-support.rst
@@ -33,8 +33,10 @@ maintained support** in targeted kernels.
Add Required meta-layers
************************
-Oniro flavours configuration templates (stored in `distro/oniro/flavours <https://booting.oniroproject.org/distro/oniro/-/tree/dunfell/flavours>`_
-directory) consist of the following files:
+Oniro flavours configuration templates (stored in the `flavours
+<https://gitlab.eclipse.org/eclipse/oniro-core/oniro/-/tree/kirkstone/flavours>`_
+`oniro <https://gitlab.eclipse.org/eclipse/oniro-core/oniro>`_ repository
+subdirectory) consist of the following files:
.. list-table:: Configuration Files
:header-rows: 1
@@ -51,7 +53,7 @@ directory) consist of the following files:
|main_project_name| build system uses ***repo*** tool for cloning required meta-layers
into appropriate build directory structure (see :ref:`Setting up a repo workspace <RepoWorkspace>`).
-To include a new layer, it has to be added in two places of the `oniro repository <https://booting.oniroproject.org/distro/oniro/-/tree/dunfell/manifests>`_:
+To include a new layer, it has to be added in two places of the `oniro repository <https://gitlab.eclipse.org/eclipse/oniro-core/oniro/-/tree/kirkstone/manifests>`_:
- The manifest file
- The flavours ``bblayers.conf.sample`` file
@@ -80,4 +82,4 @@ Create Merge Requests
Create the Merge Request against the ***dunfell*** branch according to the
Contributing Process for repositories:
-- `distro/oniro <https://booting.oniroproject.org/distro/oniro>`_
+- `eclipse/oniro-core/oniro <https://gitlab.eclipse.org/eclipse/oniro-core/oniro>`_
diff --git a/docs/oniro-quick-build.rst b/docs/oniro-quick-build.rst
index 58c26607..3d107ef4 100644
--- a/docs/oniro-quick-build.rst
+++ b/docs/oniro-quick-build.rst
@@ -52,7 +52,7 @@ Initialize a repo workspace and clone all required repositories:
.. code-block:: console
$ mkdir oniroproject; cd oniroproject
- $ repo init -u https://booting.oniroproject.org/distro/oniro
+ $ repo init -u https://gitlab.eclipse.org/eclipse/oniro-core/oniro.git -b kirkstone
$ repo sync --no-clone-bundle
Building an Oniro image
diff --git a/docs/os/linux/partition-table.rst b/docs/os/linux/partition-table.rst
index 22b6ca9f..40979ce8 100644
--- a/docs/os/linux/partition-table.rst
+++ b/docs/os/linux/partition-table.rst
@@ -11,8 +11,8 @@ Disk Partition Table
Overview
********
-The OS defines the partitions included as part of the Linux-based distro as it
-follows:
+The OS defines the partitions included as part of the Linux-based distribution
+as it follows:
* boot
diff --git a/docs/repo-workspace.rst b/docs/repo-workspace.rst
index 7a12c26a..b7c2b7e4 100644
--- a/docs/repo-workspace.rst
+++ b/docs/repo-workspace.rst
@@ -92,7 +92,7 @@ repositories. If you're on OpenMandriva, simply ``dnf install repo``.
The Manifests
*************
-The ``repo manifest`` files are part of the main `oniro repository <https://booting.oniroproject.org/distro/oniro>`_
+The ``repo manifest`` files are part of the main `oniro repository <https://gitlab.eclipse.org/eclipse/oniro-core/oniro.git>`_
and are to be used for configuring a workspace. The project provides a single
``default.xml`` manifest file in each of the active branches.
@@ -109,7 +109,7 @@ This will bring in all the needed sources for building |main_project_name|:
.. code-block:: console
$ mkdir oniroproject; cd oniroproject
- $ repo init -u https://booting.oniroproject.org/distro/oniro
+ $ repo init -u https://gitlab.eclipse.org/eclipse/oniro-core/oniro.git -b kirkstone
$ repo sync --no-clone-bundle
Workspace Structure
diff --git a/docs/yocto-build-system/yocto-project.rst b/docs/yocto-build-system/yocto-project.rst
index 3ac32e6c..026029b3 100644
--- a/docs/yocto-build-system/yocto-project.rst
+++ b/docs/yocto-build-system/yocto-project.rst
@@ -35,7 +35,7 @@ for more information.
--------------------------------
|main_project_name| bases its build setup on OE-core and bitbake. The main hub
-of layers, is `oniro <https://booting.oniroproject.org/distro/oniro/>`_, a
+of layers, is `oniro <https://gitlab.eclipse.org/eclipse/oniro-core/oniro/>`_, a
collection of layers with different scopes for defining the project's
requirements and capabilities.
@@ -51,7 +51,7 @@ For more details of each provided layer of ``oniro``, see the relevant
``README.md`` file at the root of the layer.
Besides the ``oniro`` collection of layers, the project is also the home
-to a set of other build system layers. Explore them all in our project `GitLab <https://booting.oniroproject.org/distro>`_
+to a set of other build system layers. Explore them all in our project `GitLab <https://gitlab.eclipse.org/eclipse/oniro-core/>`_
instance.
Additional Documentation
diff --git a/meta-oniro-core/README.md b/meta-oniro-core/README.md
index 863f2763..d35ca42d 100644
--- a/meta-oniro-core/README.md
+++ b/meta-oniro-core/README.md
@@ -37,9 +37,10 @@ consideration.
## Merge requests
-All contributions are to be handled as merge requests in the
-[oniro Gitlab repository](https://booting.oniroproject.org/distro/oniro). For
-more information on the contributing process, check the `CONRIBUTING.md` file.
+All contributions are to be handled as merge requests to the
+[oniro Gitlab repository](https://gitlab.eclipse.org/eclipse/oniro-core/oniro.git).
+For more information on the contributing process, check the `CONRIBUTING.md`
+file.
## Maintainers
diff --git a/meta-oniro-staging/README.md b/meta-oniro-staging/README.md
index 36669fba..ceee4a71 100644
--- a/meta-oniro-staging/README.md
+++ b/meta-oniro-staging/README.md
@@ -26,9 +26,10 @@ consideration.
## Merge requests
-All contributions are to be handled as merge requests in the
-[oniro Gitlab repository](https://booting.oniroproject.org/distro/oniro). For
-more information on the contributing process, check the `CONRIBUTING.md` file.
+All contributions are to be handled as merge requests to the
+[oniro Gitlab repository](https://gitlab.eclipse.org/eclipse/oniro-core/oniro.git).
+For more information on the contributing process, check the `CONRIBUTING.md`
+file.
## Maintainers
--
GitLab