[meta-oe][PATCH v2] mariadb: clean the empty /lib dir

[meta-oe][PATCH v2] mariadb: clean the empty /lib dir

[Yu, Mingli]

From: Mingli Yu <mingli.yu@windriver.com>

When usrmerge is enabled in DISTRO_FEATURES, there
comes below error:
ERROR: mariadb-10.4.12-r0 do_package_qa: QA Issue: mariadb-leftovers package is not obeying usrmerge distro feature. /lib should be relocated to /usr. [usrmerge]
ERROR: mariadb-10.4.12-r0 do_package_qa: QA run found fatal errors. Please consider fixing them.

It is because empty /lib dir exists in mariadb-leftovers
as below:
 $ rpm -qpl mariadb-leftovers-10.4.12-r0.core2_64.rpm |grep ^/lib
 /lib

Considering the empty /lib dir is introduced when pam
is enabled in DISTRO_FEATURES, so remove the empty /lib
dir when pam is enabled to fix the above error.

Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
 meta-oe/recipes-dbs/mysql/mariadb.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc
index 5ff273e..95f5acb 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb.inc
+++ b/meta-oe/recipes-dbs/mysql/mariadb.inc
@@ -170,6 +170,7 @@ do_install() {
     fi
     if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then
         mv ${D}/lib/security ${D}/${libdir}
+        rmdir --ignore-fail-on-non-empty ${D}/lib
     fi
 }
 
-- 
2.7.4