From 43938f11afa0e22a90c8ec6ccb8d9a861f950056 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Fri, 27 Aug 2010 16:32:58 +0800 Subject: sqlite3: fix multiple provider warning Use ${PN} to replace the original hardcode name in recipe PACKAGES line This fixes multiple provider warning of sqlite3 (sqlite3 and sqlite3-nativesdk) Signed-off-by: Dongxiao Xu --- meta/packages/sqlite/sqlite3.inc | 12 ++++++------ meta/packages/sqlite/sqlite3_3.6.23.1.bb | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'meta/packages/sqlite') diff --git a/meta/packages/sqlite/sqlite3.inc b/meta/packages/sqlite/sqlite3.inc index 61bc0800c..709e3016b 100644 --- a/meta/packages/sqlite/sqlite3.inc +++ b/meta/packages/sqlite/sqlite3.inc @@ -22,12 +22,12 @@ export config_TARGET_LINK = "${CCLD}" export config_TARGET_CFLAGS = "${CFLAGS}" export config_TARGET_LFLAGS = "${LDFLAGS}" -PACKAGES = "libsqlite libsqlite-dev libsqlite-doc sqlite3 sqlite3-dbg" -FILES_sqlite3 = "${bindir}/*" -FILES_libsqlite = "${libdir}/*.so.*" -FILES_libsqlite-dev = "${libdir}/*.a ${libdir}/*.la ${libdir}/*.so \ +PACKAGES = "lib${PN} lib${PN}-dev lib${PN}-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_libsqlite-doc = "${docdir} ${mandir} ${infodir}" -AUTO_LIBNAME_PKGS = "libsqlite" +FILES_lib${PN}-doc = "${docdir} ${mandir} ${infodir}" +AUTO_LIBNAME_PKGS = "lib${PN}" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/packages/sqlite/sqlite3_3.6.23.1.bb b/meta/packages/sqlite/sqlite3_3.6.23.1.bb index 479516d26..5075dd35b 100644 --- a/meta/packages/sqlite/sqlite3_3.6.23.1.bb +++ b/meta/packages/sqlite/sqlite3_3.6.23.1.bb @@ -1,3 +1,3 @@ require sqlite3.inc -PR = "r0" +PR = "r1" -- cgit v1.2.3