From 083798ed55442f68b05e6c22769c00dc9c88ca20 Mon Sep 17 00:00:00 2001
From: Francesco Pham <francesco.pham@huawei.com>
Date: Mon, 6 Feb 2023 10:42:19 +0100
Subject: [PATCH] hilog-Add-tests.patch: apply patch in the
base/hiviewdfx/hilog subdir
regenerate patch from the ${S}/base/hiviewdfx/hilog patch directory, and
apply the patch to the subdirectory.
This allows `devtool modify openharmony standard` to properly apply
the patch in the external workspace.
Signed-off-by: Francesco Pham <francesco.pham@huawei.com>
---
.../openharmony-standard-3.0/hilog-Add-tests.patch | 12 ++++++------
.../openharmony/openharmony-standard_3.0.bb | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/recipes-openharmony/openharmony/openharmony-standard-3.0/hilog-Add-tests.patch b/recipes-openharmony/openharmony/openharmony-standard-3.0/hilog-Add-tests.patch
index 83bca921..f98158e0 100644
--- a/recipes-openharmony/openharmony/openharmony-standard-3.0/hilog-Add-tests.patch
+++ b/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": [
diff --git a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb b/recipes-openharmony/openharmony/openharmony-standard_3.0.bb
index 0fb7ed6f..23b396bb 100644
--- a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb
+++ b/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"
--
GitLab