Merge branch 'devtool' into 'kirkstone'

openharmony-standard_3.0: allow devtool to properly unpack sources

See merge request eclipse/oniro-core/meta-openharmony!95

recipes-openharmony/openharmony/openharmony-standard-3.0/hilog-Add-tests.patch

@@ -10,10 +10,10 @@ has a valid reason for having it commented out.
 Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
 Upstream-Status: Pending
 
-diff --git a/base/hiviewdfx/hilog/BUILD.gn b/base/hiviewdfx/hilog/BUILD.gn
+diff --git a/BUILD.gn b/BUILD.gn
 index 19a70e0..41fcac0 100644
---- a/base/hiviewdfx/hilog/BUILD.gn
-+++ b/base/hiviewdfx/hilog/BUILD.gn
+--- a/BUILD.gn
++++ b/BUILD.gn
 @@ -18,8 +18,8 @@ group("hilog_target") {
  }
  
@@ -25,10 +25,10 @@ index 19a70e0..41fcac0 100644
 +    "test:HiLogNDKTest",
    ]
  }
-diff --git a/base/hiviewdfx/hilog/ohos.build b/base/hiviewdfx/hilog/ohos.build
+diff --git a/ohos.build b/ohos.build
 index f17894e..56488e4 100644
---- a/base/hiviewdfx/hilog/ohos.build
-+++ b/base/hiviewdfx/hilog/ohos.build
+--- a/ohos.build
++++ b/ohos.build
 @@ -7,6 +7,9 @@
      "hilog": {
        "module_list": [

recipes-openharmony/openharmony/openharmony-standard-sources-3.0.inc

@@ -444,7 +444,7 @@ SRCREV_FORMAT .= "+signcenter_tool"
 # repository, from which only necessary files will be copied to the OH_SRCDIR
 # and the rest will be removed in the do_unpack stage postfunc.
 OH_GRALLOC_TMP_DIR = "tmp_hihope"
-SRC_URI += "${GITEE_URL}/device_board_hihope.git;protocol=https;branch=OpenHarmony-3.1-Release;name=device_board_hihope;destsuffix=${OH_GRALLOC_TMP_DIR};lfs=0"
+SRC_URI += "${GITEE_URL}/device_board_hihope.git;protocol=https;branch=OpenHarmony-3.1-Release;name=device_board_hihope;destsuffix=${OH_SRCDIR}/${OH_GRALLOC_TMP_DIR};lfs=0"
 SRCREV_device_board_hihope = "baab11f2692d9ddbebf8790a5e4a0edd48bdb9bf"
 SRCREV_FORMAT .= "+device_board_hihope"
 SRC_URI += "https://repo.huaweicloud.com/harmonyos/compiler/restool/1.023-d/restool.tar.gz;name=restool;subdir=${OH_SRCDIR}/prebuilts/build-tools/common"
@@ -524,14 +524,13 @@ create_symlinks() {
 # Cherry-pick display directory containing required gralloc implementation
 # out of hihope board repository and remove the rest
 cherry_pick_sources() {
-    if [ ! -d "${WORKDIR}/${OH_GRALLOC_TMP_DIR}" ]; then
-        bbfatal "OH_GRALLOC_TMP_DIR (${WORKDIR}/${OH_GRALLOC_TMP_DIR}) not found!"
+    if [ ! -d "${S}/${OH_GRALLOC_TMP_DIR}" ]; then
+        bbfatal "OH_GRALLOC_TMP_DIR (${S}/${OH_GRALLOC_TMP_DIR}) not found!"
     fi
 
-    TARGET_DIR="${WORKDIR}/${OH_SRCDIR}/device/hihope/hardware/"
+    TARGET_DIR="${S}/device/hihope/hardware/"
     install -d "${TARGET_DIR}"
-    cp -R "${WORKDIR}/${OH_GRALLOC_TMP_DIR}/hardware/display" "${TARGET_DIR}"
-    rm -r "${WORKDIR}/${OH_GRALLOC_TMP_DIR}"
+    cp -R "${S}/${OH_GRALLOC_TMP_DIR}/hardware/display" "${TARGET_DIR}"
 }
 
 do_unpack[postfuncs] += "create_symlinks"

recipes-openharmony/openharmony/openharmony-standard_3.0.bb

@@ -31,7 +31,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/openharmony-standard-${OPENHARMONY_VERSIO
 SRC_URI += "${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)}"
 
 # TODO: we probably want these
-SRC_URI += "file://hilog-Add-tests.patch"
+SRC_URI += "file://hilog-Add-tests.patch;patchdir=${S}/base/hiviewdfx/hilog"
 
 SRC_URI += "file://bison_parser.patch;patchdir=${S}/third_party/libxkbcommon"
 SRC_URI += "file://flexlexer.patch;patchdir=${S}/base/update/updater"
@@ -49,7 +49,7 @@ 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 += "file://peripherals-Limit-drivers-list-to-supported-by-the-qemuarm.patch;patchdir=${S}/drivers/adapter"
-SRC_URI += "file://display_device.c;subdir=${S}/drivers/peripheral/display/hal/default/standard_system"
+SRC_URI += "file://display_device.c;subdir=src/drivers/peripheral/display/hal/default/standard_system"
 SRC_URI += "file://display-Use-temporary-qemuarm-implementation.patch;patchdir=${S}/drivers/peripheral"
 SRC_URI += "file://display_gralloc_gbm.c-Use-card-drm-node.patch;patchdir=${S}/device/hihope"
 SRC_URI += "file://hihope-gralloc-Backport-to-3.0.patch;patchdir=${S}/device/hihope"