From 64891819e2c9c93862949b8ec78f0d33ad7fd1da Mon Sep 17 00:00:00 2001
From: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
Date: Wed, 17 Feb 2021 17:06:58 +0100
Subject: [PATCH] ohos-xts-acts: Move .so files to primary package

The OHOS uses unversioned versioned libraries.
Move the naked .so files to the primary package.

This should resolve errors that prevent adding additional tests and test
libraries to the recipe:

    ERROR: ohos-xts-acts-0.0+gitAUTOINC+ca29e6cacc-r0 do_package_qa: QA
    Issue: -dev package contains non-symlink .so: ohos-xts-acts-dev path
    '/work/core2-64-poky-linux/ohos-xts-acts/0.0+gitAUTOINC+ca29e6cacc-r0/packages-split/ohos-xts-acts-dev/usr/lib/libohos-kernel-fs.so'
    -dev package contains non-symlink .so: ohos-xts-acts-dev path
    '/work/core2-64-poky-linux/ohos-xts-acts/0.0+gitAUTOINC+ca29e6cacc-r0/packages-split/ohos-xts-acts-dev/usr/lib/libohos-kernel-utils.so'

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>
---
 .../recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb b/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb
index a0865cca..0a5f9d2e 100644
--- a/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb
+++ b/meta-ohos-acts/recipes-ohos-xts-acts/ohos-xts-acts/ohos-xts-acts_git.bb
@@ -8,6 +8,11 @@ SRCREV = "2a3e429e72f8612e74a7d1e32567be11ef1541c4"
 S = "${WORKDIR}/git"
 PV = "0.0+git${SRCPV}"
 
+# The OHOS uses unversioned versioned libraries.
+# Move the naked .so files to the primary package.
+SOLIBS = ".so"
+FILES_SOLIBSDEV = ""
+
 inherit zmk
 
 DEPENDS += "ohos-googletest ohos-libsec"
-- 
GitLab