diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-08-03 23:19:36 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-03 18:07:25 +0100 |
commit | 5fbac72eb8c3cddf10876cf007aff54180c7264e (patch) | |
tree | 1323a3e9d39e5047d759ef10ee50723a2366b108 /meta | |
parent | 0a4953bab4a31f5e0c029e050976b03385423f12 (diff) | |
download | ast2050-yocto-poky-5fbac72eb8c3cddf10876cf007aff54180c7264e.zip ast2050-yocto-poky-5fbac72eb8c3cddf10876cf007aff54180c7264e.tar.gz |
multilib: Use BPN instead of PN for style like lib${PN}
When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.
(From OE-Core rev: fbb734e5753655de30c82c0a036c9043820e02cb)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/python/python_2.6.6.bb | 4 | ||||
-rw-r--r-- | meta/recipes-extended/augeas/augeas.inc | 12 | ||||
-rw-r--r-- | meta/recipes-extended/gamin/gamin_0.1.10.bb | 8 | ||||
-rw-r--r-- | meta/recipes-support/attr/ea-acl.inc | 2 | ||||
-rw-r--r-- | meta/recipes-support/sqlite/sqlite3.inc | 6 |
5 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-devtools/python/python_2.6.6.bb b/meta/recipes-devtools/python/python_2.6.6.bb index f71440a..c9c1a13 100644 --- a/meta/recipes-devtools/python/python_2.6.6.bb +++ b/meta/recipes-devtools/python/python_2.6.6.bb @@ -116,8 +116,8 @@ FILES_${PN}-core += "${libdir}/python${PYTHON_MAJMIN}/sitecustomize.py" FILES_${PN}-core += "${bindir}/2to3" # package libpython2 -PACKAGES =+ "lib${PN}2" -FILES_lib${PN}2 = "${libdir}/libpython*.so.*" +PACKAGES =+ "lib${BPN}2" +FILES_lib${BPN}2 = "${libdir}/libpython*.so.*" # additional stuff -dev diff --git a/meta/recipes-extended/augeas/augeas.inc b/meta/recipes-extended/augeas/augeas.inc index 619cd20..0c6d534 100644 --- a/meta/recipes-extended/augeas/augeas.inc +++ b/meta/recipes-extended/augeas/augeas.inc @@ -11,15 +11,15 @@ DEPENDS = "readline" inherit autotools -PACKAGES =+ "${PN}-lenses lib${PN} lib${PN}-dev lib${PN}-dbg" +PACKAGES =+ "${PN}-lenses lib${BPN} lib${BPN}-dev lib${BPN}-dbg" FILES_${PN}-lenses = "${datadir}/augeas/lenses" -FILES_lib${PN} = "${libdir}/*.so.*" -FILES_lib${PN}-dev = "${libdir}/*.so ${libdir}/*.a ${libdir}/*.la ${includedir} ${libdir}/pkgconfig" -FILES_lib${PN}-dbg = "${libdir}/.debug" +FILES_lib${BPN} = "${libdir}/*.so.*" +FILES_lib${BPN}-dev = "${libdir}/*.so ${libdir}/*.a ${libdir}/*.la ${includedir} ${libdir}/pkgconfig" +FILES_lib${BPN}-dbg = "${libdir}/.debug" -RDEPENDS_lib${PN} += "${PN}-lenses" -RRECOMMENDS_lib${PN} += "${PN}" +RDEPENDS_lib${BPN} += "${PN}-lenses" +RRECOMMENDS_lib${BPN} += "${PN}" LEAD_SONAME = "libaugeas.so" diff --git a/meta/recipes-extended/gamin/gamin_0.1.10.bb b/meta/recipes-extended/gamin/gamin_0.1.10.bb index 81b27c0..080a325 100644 --- a/meta/recipes-extended/gamin/gamin_0.1.10.bb +++ b/meta/recipes-extended/gamin/gamin_0.1.10.bb @@ -20,14 +20,14 @@ inherit autotools pkgconfig EXTRA_OECONF = "--without-python" -PACKAGES += "lib${PN} lib${PN}-dev" +PACKAGES += "lib${BPN} lib${BPN}-dev" FILES_${PN} = "${libexecdir}" FILES_${PN}-dbg += "${libexecdir}/.debug" -FILES_lib${PN} = "${libdir}/lib*.so.*" -FILES_lib${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/lib*.la \ +FILES_lib${BPN} = "${libdir}/lib*.so.*" +FILES_lib${BPN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/lib*.la \ ${libdir}/lib*.a ${libdir}/lib*.so" -RDEPENDS_lib${PN} = "${PN}" +RDEPENDS_lib${BPN} = "${PN}" LEAD_SONAME = "libgamin-1.so" diff --git a/meta/recipes-support/attr/ea-acl.inc b/meta/recipes-support/attr/ea-acl.inc index 9af5960..4e79421 100644 --- a/meta/recipes-support/attr/ea-acl.inc +++ b/meta/recipes-support/attr/ea-acl.inc @@ -16,7 +16,7 @@ do_install () { oe_runmake install install-lib install-dev DIST_ROOT="${D}" } -PACKAGES =+ "lib${PN} lib${PN}-dev lib${PN}-doc" +PACKAGES =+ "lib${BPN} lib${BPN}-dev lib${BPN}-doc" FILES_lib${PN} = "${base_libdir}/lib*.so.*" diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc index a5d122d..c96c6a6 100644 --- a/meta/recipes-support/sqlite/sqlite3.inc +++ b/meta/recipes-support/sqlite/sqlite3.inc @@ -17,12 +17,12 @@ export config_TARGET_LINK = "${CCLD}" export config_TARGET_CFLAGS = "${CFLAGS}" export config_TARGET_LFLAGS = "${LDFLAGS}" -PACKAGES = "lib${PN} lib${PN}-dev lib${PN}-doc ${PN} ${PN}-dbg" +PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN} ${PN}-dbg" FILES_${PN} = "${bindir}/*" FILES_lib${PN} = "${libdir}/*.so.*" FILES_lib${PN}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \ ${libdir}/pkgconfig ${includedir}" -FILES_lib${PN}-doc = "${docdir} ${mandir} ${infodir}" -AUTO_LIBNAME_PKGS = "lib${PN}" +FILES_lib${BPN}-doc = "${docdir} ${mandir} ${infodir}" +AUTO_LIBNAME_PKGS = "lib${BPN}" BBCLASSEXTEND = "native nativesdk" |