diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2d46e6fb82f4399abf97e007cf219b9f2d3c864d..020ec5d056b0c8241897e42efabceddb875ca67d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -263,7 +263,7 @@ fetch: fi - echo "Syncing mirror files to $SOURCE_MIRROR_PATH" - if [ "$CI_SERVER_HOST" = "gitlab.eclipse.org" -a - "$CI_PROJECT_PATH" = "eclipse/oniro-core/meta-openharmony" -a + "$CI_PROJECT_PATH" = "eclipse/oniro-oh/meta-openharmony" -a "$CI_COMMIT_BRANCH" = "kirkstone" ] ; then DO_MIRROR_UPDATES_CH=1 ; fi @@ -299,7 +299,7 @@ mirror_ch: - job: fetch artifacts: true rules: - - if: $CI_SERVER_HOST == "gitlab.eclipse.org" && $CI_PROJECT_PATH == "eclipse/oniro-core/meta-openharmony" && $CI_COMMIT_BRANCH == "kirkstone" + - if: $CI_SERVER_HOST == "gitlab.eclipse.org" && $CI_PROJECT_PATH == "eclipse/oniro-oh/meta-openharmony" && $CI_COMMIT_BRANCH == "kirkstone" # No need to mark builds broken due to infrastructure problems allow_failure: true tags: diff --git a/.gitlab-ci/container/bitbake-builder/README.md b/.gitlab-ci/container/bitbake-builder/README.md index 0eec1a803e755347ba4e811b8b26787506486d43..b9dde7f90e86ed94e872ec3fdee1a4dc6c8488d8 100644 --- a/.gitlab-ci/container/bitbake-builder/README.md +++ b/.gitlab-ci/container/bitbake-builder/README.md @@ -7,6 +7,6 @@ SPDX-License-Identifier: Apache-2.0 This container encapsulates build dependencies necessary to use repo and bitbake for Open Harmony from -https://gitlab.eclipse.org/eclipse/oniro-core/meta-openharmony/ +https://gitlab.eclipse.org/eclipse/oniro-oh/meta-openharmony/ The default user is called builder, making usage of bitbake easier. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e5f79e92fa705313fec51fcb89b90d23f7960206..88895e94d0ddf23e3394d9ae2171da044a430cb3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -120,7 +120,7 @@ By making a contribution to this project, I certify that: # `meta-openharmony`-specific contributions process and guidelines The project handles contributions as merge request in the project's -[GitLab instance](https://gitlab.eclipse.org/eclipse/oniro-core/meta-openharmony). +[GitLab instance](https://gitlab.eclipse.org/eclipse/oniro-oh/meta-openharmony). See above for more details. Each contributions must adhere to the [OpenEmbedded Commit Patch Message Guidelines](http://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines). diff --git a/README.md b/README.md index de0a5116834d1a702aaf3037edb9e4a17471552c..c1583e6dc16ca2fd33e7ad274cf62e8aad97530f 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,7 @@ meta-openharmony layer. You can run these commands to do this: mkdir ohoe && cd ohoe - repo init -u https://gitlab.eclipse.org/eclipse/oniro-core/meta-openharmony.git -b kirkstone + repo init -u https://gitlab.eclipse.org/eclipse/oniro-oh/meta-openharmony.git -b kirkstone repo sync --no-clone-bundle After this is done, you need to initialize the build environment. This modifies diff --git a/recipes-openharmony/openharmony/openharmony-standard-3.0/base_startup_appspawn_standard-disable-longProcName-resetting.patch b/recipes-openharmony/openharmony/openharmony-standard-3.0/base_startup_appspawn_standard-disable-longProcName-resetting.patch index cbe866c7f162e5eb6883c8d2a9d6e57331785518..7fb349a2d5c5193b4fc30f13a039a3e0c0754a21 100644 --- a/recipes-openharmony/openharmony/openharmony-standard-3.0/base_startup_appspawn_standard-disable-longProcName-resetting.patch +++ b/recipes-openharmony/openharmony/openharmony-standard-3.0/base_startup_appspawn_standard-disable-longProcName-resetting.patch @@ -12,7 +12,7 @@ https://gitee.com/openharmony/startup_appspawn/pulls/308 TODO: revisit this patch once we have more information Signed-off-by: Robert Drab <robert.drab@huawei.com> -Relates to https://gitlab.eclipse.org/eclipse/oniro-core/meta-openharmony/-/issues/42 +Relates to https://gitlab.eclipse.org/eclipse/oniro-oh/meta-openharmony/-/issues/42 Upstream-Status: Pending diff --git a/src/appspawn_server.cpp b/src/appspawn_server.cpp diff --git a/recipes-openharmony/sdk/README.rst b/recipes-openharmony/sdk/README.rst index 096f314418d53c0175fd67d22cd8e3c693f02f61..59c56225bcbee0e2f590e924839f479932ebecf5 100644 --- a/recipes-openharmony/sdk/README.rst +++ b/recipes-openharmony/sdk/README.rst @@ -17,10 +17,10 @@ OpenHarmony SDK builds that can be used directly in OpenHarmony builds. The current known limitation is that at the current stage, this support was only validated with the distro configuration, machine and layers setup provided by the - `meta-openharmony repository/layer <https://gitlab.eclipse.org/eclipse/oniro-core/meta-openharmony>`_. + `meta-openharmony repository/layer <https://gitlab.eclipse.org/eclipse/oniro-oh/meta-openharmony>`_. For more information checkout the - `meta-openharmony README file <https://gitlab.eclipse.org/eclipse/oniro-core/meta-openharmony/-/blob/kirkstone/README.md>`_. + `meta-openharmony README file <https://gitlab.eclipse.org/eclipse/oniro-oh/meta-openharmony/-/blob/kirkstone/README.md>`_. Oniro Project provides support for building an alternative open-source toolchain for use with the OpenHarmony reference implementation. This allows using an