From ef82fb5aff4ca3204b40cdf6a074d9711e543af2 Mon Sep 17 00:00:00 2001 From: Ioan-Adrian Ratiu Date: Thu, 4 Feb 2016 14:32:52 +0200 Subject: apr-util: fix loadable module packaging A new QA check was introduced by 47d38d4d86ec6a which catches recipes which install loadable modules (*.so) inside -dev packages instead of symlinks. Install apr-util's modules into ${PN} and also skip the QA check [dev-so] because it is the reverse of the check introduced by 47d38d4d86ec6a (thus if a recipe passes one it fails the other). Signed-off-by: Ioan-Adrian Ratiu Signed-off-by: Ross Burton --- meta/recipes-support/apr/apr-util_1.5.4.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'meta/recipes-support') diff --git a/meta/recipes-support/apr/apr-util_1.5.4.bb b/meta/recipes-support/apr/apr-util_1.5.4.bb index 6856db9b51..381daaddf3 100644 --- a/meta/recipes-support/apr/apr-util_1.5.4.bb +++ b/meta/recipes-support/apr/apr-util_1.5.4.bb @@ -66,9 +66,12 @@ do_install_append_class-target() { -e 's,APU_BUILD_DIR=.*,APR_BUILD_DIR=,g' ${D}${bindir}/apu-1-config } -FILES_${PN} += "${libdir}/apr-util-1/apr_dbm_gdbm-1.so" -FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/apr_dbm_gdbm.so* ${libdir}/apr-util-1/apr_dbm_gdbm.la" -FILES_${PN}-staticdev += "${libdir}/apr-util-1/apr_dbm_gdbm.a" +#files ${libdir}/apr-util-1/*.so are not symlinks but loadable modules thus they are packaged in ${PN} +FILES_${PN} += "${libdir}/apr-util-1/apr*${SOLIBS} ${libdir}/apr-util-1/apr*${SOLIBSDEV}" +FILES_${PN}-dev += "${libdir}/aprutil.exp ${libdir}/apr-util-1/*.la" +FILES_${PN}-staticdev += "${libdir}/apr-util-1/*.a" + +INSANE_SKIP_${PN} += "dev-so" inherit ptest -- cgit 1.2.3-korg