From 86b2d33acc5f371d08d42b1064d7ffa9df048e53 Mon Sep 17 00:00:00 2001 From: Stefan Schmidt <stefan.schmidt@huawei.com> Date: Fri, 8 Oct 2021 16:44:18 +0200 Subject: [PATCH] *_COREBASE: Project rename Change variable name accross layers. Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com> --- meta-ohos-blueprints/recipes-gnome/epiphany/epiphany-app.bb | 2 +- .../homeassistant/homeassistant-config-blueprint-dashboard.bb | 2 +- meta-ohos-core/conf/layer.conf | 2 +- meta-ohos-core/recipes-core/psplash/psplash_%.bbappend | 2 +- meta-ohos-core/recipes-graphics/wayland/weston-init.bbappend | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-ohos-blueprints/recipes-gnome/epiphany/epiphany-app.bb b/meta-ohos-blueprints/recipes-gnome/epiphany/epiphany-app.bb index e2afa610..2948215c 100644 --- a/meta-ohos-blueprints/recipes-gnome/epiphany/epiphany-app.bb +++ b/meta-ohos-blueprints/recipes-gnome/epiphany/epiphany-app.bb @@ -5,7 +5,7 @@ SUMMARY = "Epiphany app mode support files" BUGTRACKER = "https://gitlab.gnome.org/GNOME/epiphany" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OHOS_COREBASE}/LICENSES/Apache-2.0.txt;md5=ef3dabb8f39493f4ea410bebc1d01755" +LIC_FILES_CHKSUM = "file://${ONIRO_COREBASE}/LICENSES/Apache-2.0.txt;md5=ef3dabb8f39493f4ea410bebc1d01755" inherit allarch features_check diff --git a/meta-ohos-blueprints/recipes-homeassistant/homeassistant/homeassistant-config-blueprint-dashboard.bb b/meta-ohos-blueprints/recipes-homeassistant/homeassistant/homeassistant-config-blueprint-dashboard.bb index ea740eda..9e2abb80 100644 --- a/meta-ohos-blueprints/recipes-homeassistant/homeassistant/homeassistant-config-blueprint-dashboard.bb +++ b/meta-ohos-blueprints/recipes-homeassistant/homeassistant/homeassistant-config-blueprint-dashboard.bb @@ -5,7 +5,7 @@ SUMMARY = "Home Assistant configuration for All Scenarios OS Smart Panel \ blueprint" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${OHOS_COREBASE}/LICENSES/Apache-2.0.txt;md5=ef3dabb8f39493f4ea410bebc1d01755" +LIC_FILES_CHKSUM = "file://${ONIRO_COREBASE}/LICENSES/Apache-2.0.txt;md5=ef3dabb8f39493f4ea410bebc1d01755" INHIBIT_DEFAULT_DEPS = "1" inherit allarch diff --git a/meta-ohos-core/conf/layer.conf b/meta-ohos-core/conf/layer.conf index 79512945..31345a23 100644 --- a/meta-ohos-core/conf/layer.conf +++ b/meta-ohos-core/conf/layer.conf @@ -16,4 +16,4 @@ BBFILE_PRIORITY_meta-ohos-core = "6" LAYERDEPENDS_meta-ohos-core = "core" LAYERSERIES_COMPAT_meta-ohos-core = "dunfell" -OHOS_COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}' +ONIRO_COREBASE = '${@os.path.normpath("${LAYERDIR}/../")}' diff --git a/meta-ohos-core/recipes-core/psplash/psplash_%.bbappend b/meta-ohos-core/recipes-core/psplash/psplash_%.bbappend index 6195997d..e460d8f3 100644 --- a/meta-ohos-core/recipes-core/psplash/psplash_%.bbappend +++ b/meta-ohos-core/recipes-core/psplash/psplash_%.bbappend @@ -2,5 +2,5 @@ # # SPDX-License-Identifier: Apache-2.0 -FILESEXTRAPATHS_prepend := "${OHOS_COREBASE}/assets:" +FILESEXTRAPATHS_prepend := "${ONIRO_COREBASE}/assets:" SPLASH_IMAGES = "file://ostc-logo-small.png;outsuffix=default" diff --git a/meta-ohos-core/recipes-graphics/wayland/weston-init.bbappend b/meta-ohos-core/recipes-graphics/wayland/weston-init.bbappend index 02d0bebf..91cf230a 100644 --- a/meta-ohos-core/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-ohos-core/recipes-graphics/wayland/weston-init.bbappend @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: Apache-2.0 -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${OHOS_COREBASE}/assets:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${ONIRO_COREBASE}/assets:" SRC_URI += "${@oe.utils.conditional('WESTON_INI_BACKGROUND_IMAGE', '', '', "file://${WESTON_INI_BACKGROUND_IMAGE_BASENAME}", d)}" -- GitLab