diff --git a/recipes-openharmony/openharmony/openharmony-standard-3.0/build_node-path.patch b/recipes-openharmony/openharmony/openharmony-standard-3.0/build_node-path.patch new file mode 100644 index 0000000000000000000000000000000000000000..3659eab58c9abd773a636fe7aec865786c1694f5 --- /dev/null +++ b/recipes-openharmony/openharmony/openharmony-standard-3.0/build_node-path.patch @@ -0,0 +1,26 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: Apache-2.0 + +Backport patch for //build git repository of OpenHarmony 3.1 to +OpenHarmony 3.0 codebase. + +This tricks rebase_path() to point to the Yocto native node. + +Signed-off-by: Thierry Escande <thierry.escande@huawei.com> +Signed-off-by: Robert Drab <robert.drab@huawei.com> +Upstream-Status: Inappropriate + +diff --git a/ohos_var.gni b/ohos_var.gni +index c215f12..813f214 100755 +--- a/ohos_var.gni ++++ b/ohos_var.gni +@@ -189,7 +189,7 @@ hap_unpacking_tool = + hap_packing_tool = "//../recipe-sysroot-native/usr/lib/app_packing_tool.jar" + ace_loader_home = "//prebuilts/sdk/js-loader/build-tools/ace-loader" + nodejs_version = "v12.18.4" +-nodejs = "//prebuilts/build-tools/common/nodejs/node-${nodejs_version}-${host_os}-x64/bin/node" ++nodejs = "//../recipe-sysroot-native/usr/bin/node" + ace_loader_home = "//prebuilts/sdk/js-loader/build-tools/ace-loader/" + webpack_js = "${ace_loader_home}/node_modules/webpack/bin/webpack.js" + webpack_config_js = "${ace_loader_home}/webpack.rich.config.js" diff --git a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb b/recipes-openharmony/openharmony/openharmony-standard_3.0.bb index f08cc3bcad44da0c4877ee513fc2073484f87607..96629b31f1c113bc504354d48b1b33f299b23a00 100644 --- a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb +++ b/recipes-openharmony/openharmony/openharmony-standard_3.0.bb @@ -42,6 +42,7 @@ SRC_URI += "file://ts2abc-don-t-set-node_path-for-Linux-host-toolchain.patch;pat SRC_URI += "file://hdc-build-system-files.patch;patchdir=${S}/developtools/hdc_standard" SRC_URI += "file://build_packing-tool-path.patch;patchdir=${S}/build" +SRC_URI += "file://build_node-path.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"