From d3e0b0bfb7a42c2235a4fd17ce13ca0c949dccba Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Wed, 3 Aug 2011 23:19:36 +0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-devtools/python/python_2.6.6.bb | 4 ++-- meta/recipes-extended/augeas/augeas.inc | 12 ++++++------ meta/recipes-extended/gamin/gamin_0.1.10.bb | 8 ++++---- meta/recipes-support/attr/ea-acl.inc | 2 +- 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 f71440a592..c9c1a13cbb 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 619cd20237..0c6d53459b 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 81b27c0a46..080a3253f0 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 9af5960bae..4e794214f4 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 a5d122dc88..c96c6a6027 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" -- cgit v1.2.3-54-g00ecf