From fbb734e5753655de30c82c0a036c9043820e02cb 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. Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- meta/recipes-extended/augeas/augeas.inc | 12 ++++++------ meta/recipes-extended/gamin/gamin_0.1.10.bb | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'meta/recipes-extended') diff --git a/meta/recipes-extended/augeas/augeas.inc b/meta/recipes-extended/augeas/augeas.inc index 619cd2023..0c6d53459 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 81b27c0a4..080a3253f 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" -- cgit v1.2.3