From fd8f46605b1348ecf10fa831c95156dfd54dd632 Mon Sep 17 00:00:00 2001
From: Esben Haabendal <esben.haabendal@huawei.com>
Date: Wed, 15 Jun 2022 09:46:29 +0200
Subject: [PATCH] openharmony-standard: Install /system/usr files as well
In OpenHarmony 3.1, we now also have files in /system/usr, so we need to include
them as well.
Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>
---
.../openharmony/openharmony-standard_3.1.bb | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/recipes-openharmony/openharmony/openharmony-standard_3.1.bb b/recipes-openharmony/openharmony/openharmony-standard_3.1.bb
index c5a92e5d..198b7756 100644
--- a/recipes-openharmony/openharmony/openharmony-standard_3.1.bb
+++ b/recipes-openharmony/openharmony/openharmony-standard_3.1.bb
@@ -154,6 +154,11 @@ do_install () {
cp -r ${OHOS_PACKAGE_OUT_DIR}/system/profile/* ${D}${libdir}/openharmony/profile
ln -sfT ..${libdir}/openharmony/profile ${D}/system/profile
+ # odd files in /system/usr
+ mkdir -p ${D}${libdir}/openharmony/usr
+ cp -r ${OHOS_PACKAGE_OUT_DIR}/system/usr/* ${D}${libdir}/openharmony/usr
+ ln -sfT ..${libdir}/openharmony/usr ${D}/system/usr
+
# OpenHarmony etc (configuration) files
mkdir -p ${D}${sysconfdir}/openharmony
cp -r ${OHOS_PACKAGE_OUT_DIR}/system/etc/* ${D}${sysconfdir}/openharmony
@@ -201,7 +206,7 @@ FILES:${PN} += "${libdir}/media ${libdir}/module ${libdir}/ark ${libdir}/openhar
FILES:${PN}-configs = "${sysconfdir}"
FILES:${PN}-fonts = "${datadir}/fonts"
-FILES:${PN} += "/system/bin /system/lib /system/profile /vendor/bin /vendor/lib"
+FILES:${PN} += "/system/bin /system/lib /system/profile /system/usr /vendor/bin /vendor/lib"
FILES:${PN}-configs += "/system/etc /vendor/etc"
FILES:${PN}-fonts += "/system/fonts"
--
GitLab