From 132d5ab58a16238515c964e567cb407e1dc2c0e0 Mon Sep 17 00:00:00 2001 From: Francesco Pham Date: Thu, 18 Aug 2022 11:06:54 +0200 Subject: [PATCH 1/4] zenoh-c-examples: replace booting repo with repo on EF migrated examples repo from booting to eclipse foundation Signed-off-by: Francesco Pham --- .../recipes-apps/zenoh-c-examples/zenoh-c-examples_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oniro-blueprints-eddie/recipes-apps/zenoh-c-examples/zenoh-c-examples_git.bb b/meta-oniro-blueprints-eddie/recipes-apps/zenoh-c-examples/zenoh-c-examples_git.bb index 3ea777c..eed1421 100644 --- a/meta-oniro-blueprints-eddie/recipes-apps/zenoh-c-examples/zenoh-c-examples_git.bb +++ b/meta-oniro-blueprints-eddie/recipes-apps/zenoh-c-examples/zenoh-c-examples_git.bb @@ -12,7 +12,7 @@ SRC_OPT_CLONE_DIR = "git/apps/zenoh-c-examples" SRC_OPT_DEST = "destsuffix=${SRC_OPT_CLONE_DIR}" SRC_OPTIONS = "${SRC_OPT_PROTO};${SRC_OPT_DEST};${SRC_OPT_BRANCH}" -SRC_URI += "git://booting.oniroproject.org/francesco.pham/zenoh-c-client-example.git;${SRC_OPTIONS}" +SRC_URI += "git://gitlab.eclipse.org/mrfrank/zenoh-c-client-example.git;${SRC_OPTIONS}" SRCREV = "43465198e8c9c21056ad734ee0f15ea0a5badaf8" -- GitLab From 4a2d3ae28bd5df668ebbf6f38292ee073f5c86e8 Mon Sep 17 00:00:00 2001 From: Francesco Pham Date: Tue, 30 Aug 2022 15:37:31 +0200 Subject: [PATCH 2/4] eddie: replace coap dep with libcoap because coap recipe is replaced replacing "coap" dependency with "libcoap" because coap recipe in oniro-core is being replace with the upstream version: https://gitlab.eclipse.org/eclipse/oniro-core/oniro/-/merge_requests/226 Signed-off-by: Francesco Pham --- meta-oniro-blueprints-eddie/recipes-apps/eddie/eddie_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oniro-blueprints-eddie/recipes-apps/eddie/eddie_git.bb b/meta-oniro-blueprints-eddie/recipes-apps/eddie/eddie_git.bb index 69756c3..b6cca67 100644 --- a/meta-oniro-blueprints-eddie/recipes-apps/eddie/eddie_git.bb +++ b/meta-oniro-blueprints-eddie/recipes-apps/eddie/eddie_git.bb @@ -8,7 +8,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSES/Apache-2.0.txt;md5=ef3dabb8f39493f4ea410bebc1d01755" -DEPENDS += "coap glib-2.0" +DEPENDS += "libcoap glib-2.0" SRC_URI += "git://gitlab.eclipse.org/eclipse/oniro-core/eddie.git;protocol=https;branch=main \ file://eddie-server.service" -- GitLab From 903c9db1ee55777908f641313da94e7dc6121047 Mon Sep 17 00:00:00 2001 From: Francesco Pham Date: Fri, 9 Sep 2022 09:53:07 +0200 Subject: [PATCH 3/4] eddie: bump rev to latest main, systemd service runs eddie-virt-server - bump eddie recipe revision to latest main - `eddie-server` systemd service now runs `eddie-virt-server` executable instead of deprecated `eddie-server` Signed-off-by: Francesco Pham --- meta-oniro-blueprints-eddie/recipes-apps/eddie/eddie_git.bb | 2 +- .../recipes-apps/eddie/files/eddie-server.service | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oniro-blueprints-eddie/recipes-apps/eddie/eddie_git.bb b/meta-oniro-blueprints-eddie/recipes-apps/eddie/eddie_git.bb index b6cca67..7a425f6 100644 --- a/meta-oniro-blueprints-eddie/recipes-apps/eddie/eddie_git.bb +++ b/meta-oniro-blueprints-eddie/recipes-apps/eddie/eddie_git.bb @@ -13,7 +13,7 @@ DEPENDS += "libcoap glib-2.0" SRC_URI += "git://gitlab.eclipse.org/eclipse/oniro-core/eddie.git;protocol=https;branch=main \ file://eddie-server.service" -SRCREV = "9ba361241aabb6fe383e44e64b9f16d3f3740a63" +SRCREV = "faa80b95fabdbf01f406ed3c41451cd8b1f16457" S = "${WORKDIR}/git" diff --git a/meta-oniro-blueprints-eddie/recipes-apps/eddie/files/eddie-server.service b/meta-oniro-blueprints-eddie/recipes-apps/eddie/files/eddie-server.service index b03d87f..7279129 100644 --- a/meta-oniro-blueprints-eddie/recipes-apps/eddie/files/eddie-server.service +++ b/meta-oniro-blueprints-eddie/recipes-apps/eddie/files/eddie-server.service @@ -3,12 +3,12 @@ # SPDX-License-Identifier: Apache-2.0 [Unit] -Description=Eddie communication server +Description=Eddie virtualization server After=network-online.target Wants=network-online.target [Service] -ExecStart=eddie-server +ExecStart=eddie-virt-server Restart=always RestartSec=5 -- GitLab From 484418215157ab0391a37f21332791a39d623fff Mon Sep 17 00:00:00 2001 From: Francesco Pham Date: Fri, 9 Sep 2022 09:53:09 +0200 Subject: [PATCH 4/4] zephyr-blueprint-eddie: switch to eddie repo and set zephyr src subdir EDDIE zephyr code is now in the EDDIE repository in EF https://gitlab.eclipse.org/eclipse/oniro-core/eddie inside the `zephyr` subdirectory. Therefore replacing SRC_URI, SRCREV and ZEPHYR_SRC_DIR accordingly. Signed-off-by: Francesco Pham --- .../zephyr-kernel/zephyr-blueprint-eddie_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oniro-blueprints-eddie/recipes-kernel/zephyr-kernel/zephyr-blueprint-eddie_git.bb b/meta-oniro-blueprints-eddie/recipes-kernel/zephyr-kernel/zephyr-blueprint-eddie_git.bb index 5f95bdc..b4f9c18 100644 --- a/meta-oniro-blueprints-eddie/recipes-kernel/zephyr-kernel/zephyr-blueprint-eddie_git.bb +++ b/meta-oniro-blueprints-eddie/recipes-kernel/zephyr-kernel/zephyr-blueprint-eddie_git.bb @@ -14,11 +14,11 @@ SRC_OPT_NAME = "name=eddie" SRC_OPT_BRANCH = "branch=main" SRC_OPTIONS = "${SRC_OPT_PROTO};${SRC_OPT_DEST};${SRC_OPT_NAME};${SRC_OPT_BRANCH}" -SRC_URI += "git://gitlab.eclipse.org/mrfrank/eddie-zephyr.git;${SRC_OPTIONS}" +SRC_URI += "git://gitlab.eclipse.org/eclipse/oniro-core/eddie.git;${SRC_OPTIONS}" -SRCREV_eddie = "2a28abf6928f0aa76005335a378bbe695875dcdc" +SRCREV_eddie = "faa80b95fabdbf01f406ed3c41451cd8b1f16457" -ZEPHYR_SRC_DIR = "${S}/apps/eddie" +ZEPHYR_SRC_DIR = "${S}/apps/eddie/zephyr" # The overlay config and OpenThread itself imposes some specific requirements -- GitLab