summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-08-03 15:19:36 (GMT)
committerSaul Wold <sgw@linux.intel.com>2011-08-04 01:48:57 (GMT)
commitd3e0b0bfb7a42c2235a4fd17ce13ca0c949dccba (patch)
tree54fdb62405c39d8bfa6daa2846221278c1a90f7c
parent28d277753c5b0163793f0dda65dfb4fcb9585cb6 (diff)
downloadpoky-d3e0b0bfb7a42c2235a4fd17ce13ca0c949dccba.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>
-rw-r--r--meta/recipes-devtools/python/python_2.6.6.bb4
-rw-r--r--meta/recipes-extended/augeas/augeas.inc12
-rw-r--r--meta/recipes-extended/gamin/gamin_0.1.10.bb8
-rw-r--r--meta/recipes-support/attr/ea-acl.inc2
-rw-r--r--meta/recipes-support/sqlite/sqlite3.inc6
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"
116FILES_${PN}-core += "${bindir}/2to3" 116FILES_${PN}-core += "${bindir}/2to3"
117 117
118# package libpython2 118# package libpython2
119PACKAGES =+ "lib${PN}2" 119PACKAGES =+ "lib${BPN}2"
120FILES_lib${PN}2 = "${libdir}/libpython*.so.*" 120FILES_lib${BPN}2 = "${libdir}/libpython*.so.*"
121 121
122# additional stuff -dev 122# additional stuff -dev
123 123
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"
11 11
12inherit autotools 12inherit autotools
13 13
14PACKAGES =+ "${PN}-lenses lib${PN} lib${PN}-dev lib${PN}-dbg" 14PACKAGES =+ "${PN}-lenses lib${BPN} lib${BPN}-dev lib${BPN}-dbg"
15 15
16FILES_${PN}-lenses = "${datadir}/augeas/lenses" 16FILES_${PN}-lenses = "${datadir}/augeas/lenses"
17FILES_lib${PN} = "${libdir}/*.so.*" 17FILES_lib${BPN} = "${libdir}/*.so.*"
18FILES_lib${PN}-dev = "${libdir}/*.so ${libdir}/*.a ${libdir}/*.la ${includedir} ${libdir}/pkgconfig" 18FILES_lib${BPN}-dev = "${libdir}/*.so ${libdir}/*.a ${libdir}/*.la ${includedir} ${libdir}/pkgconfig"
19FILES_lib${PN}-dbg = "${libdir}/.debug" 19FILES_lib${BPN}-dbg = "${libdir}/.debug"
20 20
21RDEPENDS_lib${PN} += "${PN}-lenses" 21RDEPENDS_lib${BPN} += "${PN}-lenses"
22RRECOMMENDS_lib${PN} += "${PN}" 22RRECOMMENDS_lib${BPN} += "${PN}"
23 23
24LEAD_SONAME = "libaugeas.so" 24LEAD_SONAME = "libaugeas.so"
25 25
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
20 20
21EXTRA_OECONF = "--without-python" 21EXTRA_OECONF = "--without-python"
22 22
23PACKAGES += "lib${PN} lib${PN}-dev" 23PACKAGES += "lib${BPN} lib${BPN}-dev"
24FILES_${PN} = "${libexecdir}" 24FILES_${PN} = "${libexecdir}"
25FILES_${PN}-dbg += "${libexecdir}/.debug" 25FILES_${PN}-dbg += "${libexecdir}/.debug"
26FILES_lib${PN} = "${libdir}/lib*.so.*" 26FILES_lib${BPN} = "${libdir}/lib*.so.*"
27FILES_lib${PN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/lib*.la \ 27FILES_lib${BPN}-dev = "${includedir} ${libdir}/pkgconfig ${libdir}/lib*.la \
28 ${libdir}/lib*.a ${libdir}/lib*.so" 28 ${libdir}/lib*.a ${libdir}/lib*.so"
29 29
30RDEPENDS_lib${PN} = "${PN}" 30RDEPENDS_lib${BPN} = "${PN}"
31 31
32LEAD_SONAME = "libgamin-1.so" 32LEAD_SONAME = "libgamin-1.so"
33 33
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 () {
16 oe_runmake install install-lib install-dev DIST_ROOT="${D}" 16 oe_runmake install install-lib install-dev DIST_ROOT="${D}"
17} 17}
18 18
19PACKAGES =+ "lib${PN} lib${PN}-dev lib${PN}-doc" 19PACKAGES =+ "lib${BPN} lib${BPN}-dev lib${BPN}-doc"
20 20
21FILES_lib${PN} = "${base_libdir}/lib*.so.*" 21FILES_lib${PN} = "${base_libdir}/lib*.so.*"
22 22
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}"
17export config_TARGET_CFLAGS = "${CFLAGS}" 17export config_TARGET_CFLAGS = "${CFLAGS}"
18export config_TARGET_LFLAGS = "${LDFLAGS}" 18export config_TARGET_LFLAGS = "${LDFLAGS}"
19 19
20PACKAGES = "lib${PN} lib${PN}-dev lib${PN}-doc ${PN} ${PN}-dbg" 20PACKAGES = "lib${BPN} lib${BPN}-dev lib${BPN}-doc ${PN} ${PN}-dbg"
21FILES_${PN} = "${bindir}/*" 21FILES_${PN} = "${bindir}/*"
22FILES_lib${PN} = "${libdir}/*.so.*" 22FILES_lib${PN} = "${libdir}/*.so.*"
23FILES_lib${PN}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \ 23FILES_lib${PN}-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \
24 ${libdir}/pkgconfig ${includedir}" 24 ${libdir}/pkgconfig ${includedir}"
25FILES_lib${PN}-doc = "${docdir} ${mandir} ${infodir}" 25FILES_lib${BPN}-doc = "${docdir} ${mandir} ${infodir}"
26AUTO_LIBNAME_PKGS = "lib${PN}" 26AUTO_LIBNAME_PKGS = "lib${BPN}"
27 27
28BBCLASSEXTEND = "native nativesdk" 28BBCLASSEXTEND = "native nativesdk"