[oe-commits] Robert Yang : openldap: use PN for PACKAGES_DYNAMIC

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: d60684b202a19f3ec265c4914892d22a6054f478
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=d60684b202a19f3ec265c4914892d22a6054f478

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Wed Oct  8 01:01:19 2014 -0700

openldap: use PN for PACKAGES_DYNAMIC

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>

---

 meta-oe/recipes-support/openldap/openldap_2.4.39.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-support/openldap/openldap_2.4.39.bb b/meta-oe/recipes-support/openldap/openldap_2.4.39.bb
index 243e38f..8752395 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.4.39.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.4.39.bb
@@ -195,13 +195,13 @@ INITSCRIPT_PACKAGES = "${PN}-slapd"
 INITSCRIPT_NAME_${PN}-slapd = "openldap"
 INITSCRIPT_PARAMS_${PN}-slapd = "defaults"
 
-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 = []