[4/7] multilib: Use BPN instead of PN for style like lib${PN}
Submitted by Dongxiao Xu on Aug. 3, 2011, 3:19 p.m.
|
Patch ID: 9117
Details
Commit Message
@@ -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
@@ -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"
@@ -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"
@@ -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.*"
@@ -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"
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. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> --- 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(-)