Patchwork [2/5] sqlite: upgrade from 3.7.5 to 3.7.6.2

login
register
mail settings
Submitter Yu Ke
Date May 11, 2011, 7:27 a.m.
Message ID <0002456a563997ba6e69f99733292136a5419d1a.1305098201.git.ke.yu@intel.com>
Download mbox | patch
Permalink /patch/3743/
State New, archived
Headers show

Comments

Yu Ke - May 11, 2011, 7:27 a.m.
From: Yu Ke <ke.yu@intel.com>

- also remove the libtool.patch since it is already in the release version
- update the LIC_FILES_CHKSUM, the license is not changed, just use
  sqlite3.h as more appropriate license file. the original sqlite3.c
  is actually not point to license content.

Signed-off-by: Yu Ke <ke.yu@intel.com>
---
 meta/recipes-support/sqlite/sqlite3.inc           |    5 ----
 meta/recipes-support/sqlite/sqlite3/libtool.patch |   25 ---------------------
 meta/recipes-support/sqlite/sqlite3_3.7.5.bb      |   10 --------
 meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb    |   10 ++++++++
 4 files changed, 10 insertions(+), 40 deletions(-)
 delete mode 100644 meta/recipes-support/sqlite/sqlite3/libtool.patch
 delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.5.bb
 create mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb

Patch

diff --git a/meta/recipes-support/sqlite/sqlite3.inc b/meta/recipes-support/sqlite/sqlite3.inc
index 92c4930..d8ef8dc 100644
--- a/meta/recipes-support/sqlite/sqlite3.inc
+++ b/meta/recipes-support/sqlite/sqlite3.inc
@@ -6,11 +6,6 @@  DEPENDS = "readline ncurses tcl-native"
 DEPENDS_virtclass-native = "tcl-native"
 LICENSE = "PD"
 
-SRC_URI = "http://www.sqlite.org/sqlite-${PV}.tar.gz \
-	   file://libtool.patch"
-
-S = "${WORKDIR}/sqlite-${PV}"
-
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-tcl --enable-shared --enable-threadsafe"
diff --git a/meta/recipes-support/sqlite/sqlite3/libtool.patch b/meta/recipes-support/sqlite/sqlite3/libtool.patch
deleted file mode 100644
index ccf9993..0000000
--- a/meta/recipes-support/sqlite/sqlite3/libtool.patch
+++ /dev/null
@@ -1,25 +0,0 @@ 
-Index: sqlite-3.2.1/Makefile.in
-===================================================================
---- sqlite-3.2.1.orig/Makefile.in	2005-03-23 17:09:39.000000000 +0100
-+++ sqlite-3.2.1/Makefile.in	2005-04-25 23:11:20.000000000 +0200
-@@ -15,7 +15,10 @@
- # The toplevel directory of the source tree.  This is the directory
- # that contains this "Makefile.in" and the "configure.in" script.
- #
--TOP = @srcdir@
-+TOP = $(srcdir)
-+srcdir = @srcdir@
-+top_srcdir = @top_srcdir@
-+top_builddir = .
- 
- # C Compiler and options for use in building executables that
- # will run on the platform that is doing the build.
-@@ -96,7 +99,7 @@
- exec_prefix = @exec_prefix@
- libdir = @libdir@
- INSTALL = @INSTALL@
--LIBTOOL = ./libtool
-+LIBTOOL = @LIBTOOL@
- ALLOWRELEASE = @ALLOWRELEASE@
- 
- # libtool compile/link/install
diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.5.bb b/meta/recipes-support/sqlite/sqlite3_3.7.5.bb
deleted file mode 100644
index 212d9e2..0000000
--- a/meta/recipes-support/sqlite/sqlite3_3.7.5.bb
+++ /dev/null
@@ -1,10 +0,0 @@ 
-require sqlite3.inc
-
-LIC_FILES_CHKSUM = "file://sqlite3.c;endline=19;md5=c1b8048b783961c3ba387c43fd955dc6"
-
-SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3070500.tar.gz"
-S = "${WORKDIR}/sqlite-autoconf-3070500"
-PR = "r0"
-
-SRC_URI[md5sum] = "a9604a82613ade2e7f4c303f233e477f"                                                 
-SRC_URI[sha256sum] = "cb5b86926ec9f65882b2dddd244f2d620337d911ec73411863f77e48cf6a2f94"              
diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb b/meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb
new file mode 100644
index 0000000..34d1653
--- /dev/null
+++ b/meta/recipes-support/sqlite/sqlite3_3.7.6.2.bb
@@ -0,0 +1,10 @@ 
+require sqlite3.inc
+
+LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0"
+
+SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3070602.tar.gz"
+S = "${WORKDIR}/sqlite-autoconf-3070602"
+PR = "r0"
+
+SRC_URI[md5sum] = "f16c08617968b4087b3d591fd575f59f"
+SRC_URI[sha256sum] = "53aa66f30d8ff87230d4173b7979814432b8084da77fba05992223f76593fc81"