[oe] [meta-oe] [PATCH 2/2] openldap: use PN for PACKAGES_DYNAMIC

Robert Yang liezhi.yang at windriver.com
Wed Oct 8 08:01:19 UTC 2014


Fixed do_packagedata error when multilib:
ERROR: The recipe openldap is trying to install files into a shared area when those files already exist. Those files and their manifest location are:
   /path/to/sysroots/qemux86-64/pkgdata/runtime-rprovides/openldap-backends/openldap-backends
   Matched in manifest-qemux86-64-lib32-openldap.packagedata
   /path/to/tmp/sysroots/qemux86-64/pkgdata/runtime/openldap-backends.packaged
   Matched in manifest-qemux86-64-lib32-openldap.packagedata
   /path/to/tmp/sysroots/qemux86-64/pkgdata/runtime/openldap-backends
   Matched in manifest-qemux86-64-lib32-openldap.packagedata
Please verify which recipe should provide the above files.

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
---
 .../recipes-support/openldap/openldap_2.4.23.bb    |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
index b2693b5..198d2d7 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.23.bb
@@ -194,13 +194,13 @@ pkg_prerm_${PN}-slapd () {
     update-rc.d $D openldap remove
 }
 
-PACKAGES_DYNAMIC += "^openldap-backends.* ^openldap-backend-.*"
+PACKAGES_DYNAMIC += "^${PN}-backends.* ^${PN}-backend-.*"
 
 python populate_packages_prepend () {
     backend_dir    = d.expand('${libexecdir}/openldap')
     do_split_packages(d, backend_dir, 'back_([a-z]*)\-.*\.so\..*$', 'openldap-backend-%s', 'OpenLDAP %s backend', extra_depends='', allow_links=True)
 
-    metapkg = "openldap-backends"
+    metapkg = "${PN}-backends"
     d.setVar('ALLOW_EMPTY_' + metapkg, "1")
     d.setVar('FILES_' + metapkg, "")
     metapkg_rdepends = []
-- 
1.7.9.5




More information about the Openembedded-devel mailing list