diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2014-10-08 01:01:19 -0700 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-10 12:47:35 +0200 |
| commit | a4bdcbdbca05bbb4a452e06982038f0a38bcb91f (patch) | |
| tree | 9bc991841384de9d1c601421db38f1e66de65dee /meta-oe/recipes-support/openldap | |
| parent | 95d7606c6706a6bae9814879eb5640ae70166c86 (diff) | |
| download | meta-openembedded-contrib-a4bdcbdbca05bbb4a452e06982038f0a38bcb91f.tar.gz | |
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@windriver.com>
Diffstat (limited to 'meta-oe/recipes-support/openldap')
| -rw-r--r-- | meta-oe/recipes-support/openldap/openldap_2.4.39.bb | 4 |
1 files 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 243e38f392..8752395fab 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 = [] |