diff options
| author | Dongxiao Xu <dongxiao.xu@intel.com> | 2010-08-27 16:32:58 +0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-31 17:21:13 +0100 |
| commit | 43938f11afa0e22a90c8ec6ccb8d9a861f950056 (patch) | |
| tree | 44f4aa2a3fddc24722022035fd97997371f94782 | |
| parent | 9c1d2567832526014aee3d6d19a4beb2f706ac63 (diff) | |
| download | openembedded-core-43938f11afa0e22a90c8ec6ccb8d9a861f950056.tar.gz openembedded-core-43938f11afa0e22a90c8ec6ccb8d9a861f950056.tar.bz2 openembedded-core-43938f11afa0e22a90c8ec6ccb8d9a861f950056.zip | |
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>
| -rw-r--r-- | meta-moblin/packages/tasks/task-moblin-standalone-sdk-target.bb | 4 | ||||
| -rw-r--r-- | meta/packages/sqlite/sqlite3.inc | 12 | ||||
| -rw-r--r-- | meta/packages/sqlite/sqlite3_3.6.23.1.bb | 2 | ||||
| -rw-r--r-- | meta/packages/tasks/task-poky-sdk-gmae.bb | 2 | ||||
| -rw-r--r-- | meta/packages/tasks/task-poky-standalone-gmae-sdk-target.bb | 2 | ||||
| -rw-r--r-- | meta/packages/tasks/task-sdk-gmae.inc | 2 |
6 files changed, 12 insertions, 12 deletions
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 bf9dc9a0a2..469bf15516 100644 --- 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 61bc0800c2..709e3016b8 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 479516d261..5075dd35b7 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" diff --git a/meta/packages/tasks/task-poky-sdk-gmae.bb b/meta/packages/tasks/task-poky-sdk-gmae.bb index 5856bfb6eb..0a263d137b 100644 --- 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 94ce7ff80f..27e72b2262 100644 --- 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 53f915a151..149dd497e1 100644 --- 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 |