From a98ea2077da7eb56f4d43435045b189096cb23b7 Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben@geanix.com>
Date: Mon, 20 Mar 2023 10:52:58 +0100
Subject: [PATCH] openharmony-standard: Include /system/usr dir in image
This includes a file needed by ICU, which when missing causes a segfault in
appspawn.
Signed-off-by: Esben Haabendal <esben@geanix.com>
---
recipes-openharmony/openharmony/openharmony-standard_3.0.bb | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb b/recipes-openharmony/openharmony/openharmony-standard_3.0.bb
index aafcbaed..b1c1e4a8 100644
--- a/recipes-openharmony/openharmony/openharmony-standard_3.0.bb
+++ b/recipes-openharmony/openharmony/openharmony-standard_3.0.bb
@@ -212,6 +212,9 @@ do_install () {
# For now, this fix is sufficient.
[ "${@get_ohos_libdir(d)}" != "lib" ] && ln -s ${@get_ohos_libdir(d)} ${D}/system/lib
+ # There is also a few files in /system/usr
+ cp -r -t ${D}/system/ ${OHOS_PACKAGE_OUT_DIR}/system/usr
+
# system ability configurations
mkdir -p ${D}${libdir}/openharmony/profile
cp -r ${OHOS_PACKAGE_OUT_DIR}/system/profile/* ${D}${libdir}/openharmony/profile
@@ -254,7 +257,7 @@ FILES:${PN}:remove = "${libdir}/${BPN}/*"
FILES:${PN}-configs = "${sysconfdir}"
FILES:${PN}-fonts = "${datadir}/fonts"
-FILES:${PN} += "/system/bin ${@get_ohos_libdirs(d)} /system/profile"
+FILES:${PN} += "/system/bin ${@get_ohos_libdirs(d)} /system/profile /system/usr"
FILES:${PN}-configs += "/system/etc"
FILES:${PN}-fonts += "/system/fonts"
--
GitLab