From b09d12031d96198d840d7cc1bc5562f6e664fe85 Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben@geanix.com>
Date: Fri, 3 Mar 2023 08:46:56 +0100
Subject: [PATCH] openharmkony-standard: Use Oniro branding instead of Yocto
Signed-off-by: Esben Haabendal <esben@geanix.com>
---
.../display-Use-temporary-qemuarm-implementation.patch | 2 +-
recipes-openharmony/openharmony/openharmony-standard_3.0.bb | 4 ++--
recipes-openharmony/openharmony/openharmony-standard_3.1.bb | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/recipes-openharmony/openharmony/openharmony-standard-3.0/display-Use-temporary-qemuarm-implementation.patch b/recipes-openharmony/openharmony/openharmony-standard-3.0/display-Use-temporary-qemuarm-implementation.patch
index dafc1138..2c5d9fb5 100644
--- a/recipes-openharmony/openharmony/openharmony-standard-3.0/display-Use-temporary-qemuarm-implementation.patch
+++ b/recipes-openharmony/openharmony/openharmony-standard-3.0/display-Use-temporary-qemuarm-implementation.patch
@@ -31,7 +31,7 @@ index a232730b..80f03706 100644
group("hdi_display") {
public_deps = [ "//device/${device_company}/hardware/display:hdi_display" ]
}
-+} else if (product_name == "yocto-ohos-qemuarm") {
++} else if (product_name == "oniro-oh-qemuarm") {
+ config("display_hdi_public_config") {
+ visibility = [ ":*" ]
+ include_dirs = [
diff --git a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb b/recipes-openharmony/openharmony/openharmony-standard_3.0.bb
index 0e0bf865..b4610d00 100644
--- a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb
+++ b/recipes-openharmony/openharmony/openharmony-standard_3.0.bb
@@ -46,7 +46,7 @@ SRC_URI += "file://build_node-path.patch;patchdir=${S}/build"
SRC_URI += "file://build_js_assets.patch;patchdir=${S}/build"
SRC_URI += "file://vendor-qemu-uhdf-files.patch;patchdir=${S}/drivers/peripheral"
-SRC_URI += "git://gitlab.eclipse.org/eclipse/oniro-core/openharmony-vendor-oniro.git;protocol=https;branch=main;rev=c7f69115d7af1a37f81bd4fc0462100d0aa87c2d;destsuffix=${S}/vendor/oniro"
+SRC_URI += "git://gitlab.eclipse.org/eclipse/oniro-core/openharmony-vendor-oniro.git;protocol=https;branch=main;rev=97aa6fa3d101378a728e4da284b95aedde38d844;destsuffix=${S}/vendor/oniro"
SRC_URI += "file://peripherals-Limit-drivers-list-to-supported-by-the-qemuarm.patch;patchdir=${S}/drivers/adapter"
SRC_URI += "file://display_device.c;subdir=src/drivers/peripheral/display/hal/default/standard_system"
@@ -112,7 +112,7 @@ def get_ohos_libdirs(d):
OHOS_DEVICE_CPU_ARCH = "${@get_ohos_arch(d)}"
OHOS_DEVICE_NAME = "qemuarm"
OHOS_DEVICE_COMPANY = "oniro"
-OHOS_PRODUCT_NAME = "yocto-ohos-${OHOS_DEVICE_NAME}"
+OHOS_PRODUCT_NAME = "oniro-oh-${OHOS_DEVICE_NAME}"
OHOS_PRODUCT_COMPANY = "oniro"
# For some reason platform type has to be phone
OHOS_PRODUCT_PLATFORM_TYPE = "phone"
diff --git a/recipes-openharmony/openharmony/openharmony-standard_3.1.bb b/recipes-openharmony/openharmony/openharmony-standard_3.1.bb
index 02a68519..ced0da64 100644
--- a/recipes-openharmony/openharmony/openharmony-standard_3.1.bb
+++ b/recipes-openharmony/openharmony/openharmony-standard_3.1.bb
@@ -46,7 +46,7 @@ SRC_URI += "file://jsframwork-use-yocto-node.patch;patchdir=${S}/third_party/jsf
SRC_URI += "file://third_party_jsframework-path-posix.patch;patchdir=${S}/third_party/jsframework"
SRC_URI += "file://ts2abc-don-t-set-node_path-for-Linux-host-toolchain.patch;patchdir=${S}/ark/ts2abc"
-SRC_URI += "git://gitlab.eclipse.org/eclipse/oniro-core/openharmony-vendor-oniro.git;protocol=https;branch=main;rev=f7ba03c8f0d90b0b12998b26e4ce0d7bac8e6a03;destsuffix=${S}/vendor/oniro"
+SRC_URI += "git://gitlab.eclipse.org/eclipse/oniro-core/openharmony-vendor-oniro.git;protocol=https;branch=main;rev=97aa6fa3d101378a728e4da284b95aedde38d844;destsuffix=${S}/vendor/oniro"
SRC_URI += "file://display-Mock-interface-for-standard-system.patch"
SRC_URI += "file://display_device.c;subdir=${S}/drivers/peripheral/display/hal/default/standard_system"
@@ -102,7 +102,7 @@ COMPATIBLE_MACHINE = "qemuarm"
OHOS_DEVICE_CPU_ARCH = "arm"
OHOS_DEVICE_NAME = "qemuarm"
OHOS_DEVICE_COMPANY = "oniro"
-OHOS_PRODUCT_NAME = "yocto-ohos-${OHOS_DEVICE_NAME}"
+OHOS_PRODUCT_NAME = "oniro-oh-${OHOS_DEVICE_NAME}"
OHOS_PRODUCT_COMPANY = "oniro"
# For some reason platform type has to be phone
OHOS_PRODUCT_PLATFORM_TYPE = "phone"
--
GitLab