aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2020-04-16 13:51:00 +0800
committerKhem Raj <raj.khem@gmail.com>2020-04-16 08:43:06 -0700
commit4ebfa9afa4d8b608999338bf38e2c8ad596aad58 (patch)
treef9130f68e9a7d1f8d0742005690f47811d0a6a17 /meta-oe
parente17b7701d0428d8ee546cbfbdc0f1599f6e981d5 (diff)
downloadmeta-openembedded-4ebfa9afa4d8b608999338bf38e2c8ad596aad58.tar.gz
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 <mingli.yu@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb.inc1
1 files changed, 1 insertions, 0 deletions
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
}