From 04b2f6c2095436a60ba2bb0c0672a8caa4428ded Mon Sep 17 00:00:00 2001
From: Thierry Escande <thierry.escande@huawei.com>
Date: Mon, 27 Jun 2022 16:30:03 +0200
Subject: [PATCH] oniro-openharmony-linux.conf: Add MUSL_LDSO_PATHS distro
variable
This variable holds the system library folders used by OpenHarmony. It
will be used to generate the file /etc/ld-musl-${MUSL_LDSO_ARCH}.path.
It will also be used to do a sanity check and verify that all
/lib/module/* subfolders are parts of this musl ldso file.
Signed-off-by: Thierry Escande <thierry.escande@huawei.com>
---
conf/distro/include/musl-ldso-paths.inc | 23 +++++++++++++++++++++++
conf/distro/oniro-openharmony-linux.conf | 1 +
2 files changed, 24 insertions(+)
create mode 100644 conf/distro/include/musl-ldso-paths.inc
diff --git a/conf/distro/include/musl-ldso-paths.inc b/conf/distro/include/musl-ldso-paths.inc
new file mode 100644
index 00000000..a76324bf
--- /dev/null
+++ b/conf/distro/include/musl-ldso-paths.inc
@@ -0,0 +1,23 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+MUSL_LDSO_PATHS = " \
+ module \
+ module/ability \
+ module/account \
+ module/app \
+ module/data \
+ module/distributedhardware \
+ module/multimedia \
+ module/telephony \
+"
+
+MUSL_LDSO_PATHS:append:openharmony-3.1 = " \
+ module/application \
+ module/bundle \
+ module/events \
+ module/multimodalinput \
+ module/net \
+ module/security \
+"
diff --git a/conf/distro/oniro-openharmony-linux.conf b/conf/distro/oniro-openharmony-linux.conf
index cb429c6f..7036ac9a 100644
--- a/conf/distro/oniro-openharmony-linux.conf
+++ b/conf/distro/oniro-openharmony-linux.conf
@@ -43,6 +43,7 @@ INHERIT += "uninative"
require include/openssl.inc
require include/java.inc
+require include/musl-ldso-paths.inc
# Workaround for missing host tools in do_testimage when not adding testimage to
# IMAGE_CLASSES, but doing a direct `inherit testimage` in image recipes
--
GitLab