prebuilts: Move recipe files to openharmony-3.0 directory

This moves the 3.0 specific patches and files to an openharmony-3.0
directory.

Instead of using DISTRO_VERSION, this now uses OHOS_VERSION to determine
which OpenHarmony is built. DISTRO_VERSION has been reset to 1.99.99 to
stick to oniro-core and avoid confusion with OpenHarmony version (3.0 or
3.1 for now).

Signed-off-by: Thierry Escande <thierry.escande@huawei.com>

conf/distro/oniro-openharmony-linux.conf

@@ -4,7 +4,11 @@
 
 DISTRO = "oniro-openharmony-linux"
 DISTRO_NAME = "Oniro/OpenHarmony Linux Distro"
-DISTRO_VERSION = "3.0"
+DISTRO_VERSION = "1.99.99"
+
+# OpenHarmony OS version
+OPENHARMONY_VERSION = "3.0"
+PREFERRED_VERSION_openharmony-standard = "${OPENHARMONY_VERSION}"
 
 # LLVM/Clang toolchain
 TOOLCHAIN = "clang"

recipes-openharmony/prebuilts/oniro-openharmony-target-integration.bb

@@ -9,6 +9,8 @@ LIC_FILES_CHKSUM += "file://BUILD_target.gn;beginline=1;endline=3;md5=a153785666
 S = "${WORKDIR}"
 B = "${WORKDIR}/build"
 
+FILESEXTRAPATHS:prepend := "${THISDIR}/openharmony-${OPENHARMONY_VERSION}:"
+
 SRC_URI = "file://BUILD_target.gn"
 
 TARGET_GN_CPU = "${TRANSLATED_TARGET_ARCH}"

recipes-openharmony/prebuilts/oniro-openharmony-thirdparty-integration-3.0.inc

+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# This file is intentionally left empty.
+# It is needed so the 'require' statement in oniro-openharmony-thirdparty-integration.bb doesn't fail

recipes-openharmony/prebuilts/oniro-openharmony-thirdparty-integration.bb

@@ -15,10 +15,14 @@ DEPENDS += "oniro-openharmony-toolchain-integration"
 S = "${WORKDIR}/src"
 B = "${WORKDIR}/build"
 
+FILESEXTRAPATHS:prepend := "${THISDIR}/openharmony-${OPENHARMONY_VERSION}:"
+
 SRC_URI += "file://patches/build_third_party.patch;apply=no;subdir=src"
 
 SRC_URI += "file://third_party/openssl/BUILD.gn;subdir=src/overlay"
 
+require oniro-openharmony-thirdparty-integration-${OPENHARMONY_VERSION}.inc
+
 do_install() {
     mkdir -p ${D}${datadir}/oniro-openharmony
     cp -rv ${S}/* ${D}${datadir}/oniro-openharmony/

recipes-openharmony/prebuilts/oniro-openharmony-toolchain-integration-3.0.inc

+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# This file is intentionally left empty.
+# It is needed so the 'require' statement in oniro-openharmony-toolchain-integration.bb doesn't fail

recipes-openharmony/prebuilts/oniro-openharmony-toolchain-integration.bb

@@ -13,6 +13,8 @@ INHIBIT_DEFAULT_DEPS = "1"
 S = "${WORKDIR}/src"
 B = "${WORKDIR}/build"
 
+FILESEXTRAPATHS:prepend := "${THISDIR}/openharmony-${OPENHARMONY_VERSION}:"
+
 SRC_URI += "file://setup.sh;subdir=src"
 SRC_URI += "file://relocate-ld-scripts.sh"
 SRC_URI += "file://BUILD.gn;subdir=src"
@@ -40,6 +42,8 @@ SRC_URI += "file://build/common/musl/BUILD.gn;subdir=src/overlay"
 
 SRC_URI += "file://BUILD_host.gn"
 
+require oniro-openharmony-toolchain-integration-${OPENHARMONY_VERSION}.inc
+
 SDK_DYNAMIC_LINKER:x86-64  = "ld-linux-x86-64.so.2"
 SDK_DYNAMIC_LINKER:x86     = "ld-linux.so.2"
 SDK_DYNAMIC_LINKER:aarch64 = "ld-linux-aarch64.so.1"