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 <dongxiao.xu@intel.com>

diff --git a/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb b/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb
index bf9dc9a0a2a5125b56917096e69c7cee40f9f61c..469bf15516a21bc8ed5192397e62e451e75dc37c 100644 (file)
--- a/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb
+++ b/meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTION = "Target packages for the standalone Moblin SDK"
-PR = "r6"
+PR = "r7"
 LICENSE = "MIT"
 ALLOW_EMPTY = "1"
 
@@ -26,7 +26,7 @@ RDEPENDS_${PN} = "\
     libebook-dev \
     libglade-dev \
     libxi-dev \
-    libsqlite-dev \
+    libsqlite3-dev \
     clutter-1.0-dev \
     nbtk-dev \
     mutter-dev \

diff --git a/meta/packages/sqlite/sqlite3.inc b/meta/packages/sqlite/sqlite3.inc
index 61bc0800c20bbcce26eb49f0dfc39327991aa5a1..709e3016b8c62cf839a56efaa2df7f3281cd8cd4 100644 (file)
--- 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 479516d261fef0cfca646b9d07bf44ab1dfbc052..5075dd35b7e4f8a4672de88f12e362342c002156 100644 (file)
--- 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"

diff --git a/meta/packages/tasks/task-poky-sdk-gmae.bb b/meta/packages/tasks/task-poky-sdk-gmae.bb
index 5856bfb6eb36d8c6daf884854887e3fd37f5fb8e..0a263d137b545c91c8733174dfbcfa0cbe21000c 100644 (file)
--- a/meta/packages/tasks/task-poky-sdk-gmae.bb
+++ b/meta/packages/tasks/task-poky-sdk-gmae.bb
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTON = "Gnome Mobile And Embedded Software Development Kit for OpenedHand Poky"
-PR = "r6"
+PR = "r7"
 
 ALLOW_EMPTY = "1"
 

diff --git a/meta/packages/tasks/task-poky-standalone-gmae-sdk-target.bb b/meta/packages/tasks/task-poky-standalone-gmae-sdk-target.bb
index 94ce7ff80f044bbfbfa531b9b15b0fd4473965b7..27e72b2262d03aa7c1078ae3a995f312f044b1aa 100644 (file)
--- a/meta/packages/tasks/task-poky-standalone-gmae-sdk-target.bb
+++ b/meta/packages/tasks/task-poky-standalone-gmae-sdk-target.bb
@@ -3,7 +3,7 @@
 #
 
 DESCRIPTON = "Gnome Mobile And Embedded Software Development Kit for OpenedHand Poky"
-PR = "r9"
+PR = "r10"
 
 ALLOW_EMPTY = "1"
 

diff --git a/meta/packages/tasks/task-sdk-gmae.inc b/meta/packages/tasks/task-sdk-gmae.inc
index 53f915a151126d4bf7990f15bc4f6c26a9d1bd3a..149dd497e1ade90ccb4b4717ae7275d46058d105 100644 (file)
--- a/meta/packages/tasks/task-sdk-gmae.inc
+++ b/meta/packages/tasks/task-sdk-gmae.inc
@@ -11,7 +11,7 @@ SDK-GMAE = " \
     libecal-dev \
     libebook-dev \
     libxi-dev \
-    libsqlite-dev \
+    libsqlite3-dev \
     "
 
 # TODO: gvfs-dev, mission-control