From 4ebfa9afa4d8b608999338bf38e2c8ad596aad58 Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Thu, 16 Apr 2020 13:51:00 +0800 Subject: mariadb: clean the empty /lib dir 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 Signed-off-by: Khem Raj --- meta-oe/recipes-dbs/mysql/mariadb.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-oe') diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 5ff273ec27..95f5acba1f 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 } -- cgit 1.2.3-korg