Skip to contentSkip to conversation

Upgrade sqlite to 3.9.0

PATCH In review [email protected] 3 participants 7 messages Oct 16, 2015 – Nov 3, 2015

lore
Share & tools
lore
#0 lore raw

cover Upgrade sqlite to 3.9.0

From: Kai Kang <[email protected]>

The following changes since commit e35c404537db0b46047fcb2ee7d3645e3e0935c5:

bitbake: toaster: Don't descend into directories for cached_layers (2015-10-11 08:12:58 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib kangkai/sqlite3
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kangkai/sqlite3

Kai Kang (1):
sqlite: 3.8.10.2 -> 3.9.0

 .../files/0001-using-the-dynamic-library.patch     | 30 ----------------------
 .../{sqlite3_3.8.10.2.bb => sqlite3_3.9.0.bb}      | 10 ++++----
 2 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
 rename meta/recipes-support/sqlite/{sqlite3_3.8.10.2.bb => sqlite3_3.9.0.bb} (72%)
Signature · 1 line
2.6.1
#1 lore raw

PATCH 1/1 sqlite: 3.8.10.2 -> 3.9.0

From: Kai Kang <[email protected]>

Upgrade sqlite from 3.8.10.2 to 3.9.0.

* update python function to get right SRC_URI
* drop 0001-using-the-dynamic-library.patch which use dynamic library that it is done that way in new version

---
 .../files/0001-using-the-dynamic-library.patch     | 30 ----------------------
 .../{sqlite3_3.8.10.2.bb => sqlite3_3.9.0.bb}      | 10 ++++----
 2 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch
 rename meta/recipes-support/sqlite/{sqlite3_3.8.10.2.bb => sqlite3_3.9.0.bb} (72%)
meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch deleted +0 -30
deleted file mode 100644
index e3bfd5f..0000000
@@ -1,30 +0,0 @@
-[PATCH] using the dynamic library
-
-Upstream-Status:  Inappropriate [configuration]
-
-building statically-linked sqlite3 failed since sqlite3.o is generated in 
-different dir, even if link successes, the size of sqlite3 is become larger,
-so use the dynamic link, ref: http://patchwork.openembedded.org/patch/93293/
-
-Signed-off-by: Roy Li <[email protected]>
----
- Makefile.am | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 88bc23d..fe50f20 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -7,7 +7,8 @@ libsqlite3_la_LDFLAGS = -no-undefined -version-info 8:6:8
- 
- bin_PROGRAMS = sqlite3
- sqlite3_SOURCES = shell.c sqlite3.h
--sqlite3_LDADD = sqlite3.$(OBJEXT) @READLINE_LIBS@
-+sqlite3_LDADD = @READLINE_LIBS@ libsqlite3.la
-+
- 
- include_HEADERS = sqlite3.h sqlite3ext.h
- 
--- 
-1.9.1
-
meta/recipes-support/sqlite/sqlite3_3.9.0.bb renamed from meta/recipes-support/sqlite/sqlite3_3.8.10.2.bb +5 -5
similarity index 72%
rename from meta/recipes-support/sqlite/sqlite3_3.8.10.2.bb
rename to meta/recipes-support/sqlite/sqlite3_3.9.0.bb
index c72ad50..50531ba 100644
@@ -4,16 +4,16 @@ LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b357
 
 def sqlite_download_version(d):
     pvsplit = d.getVar('PV', True).split('.')
+    if len(pvsplit) < 4:
+        pvsplit.append('0')
     return pvsplit[0] + ''.join([part.rjust(2,'0') for part in pvsplit[1:]])
 
 PE = "3"
 SQLITE_PV = "${@sqlite_download_version(d)}"
-SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz \
-           file://0001-using-the-dynamic-library.patch \
-"
+SRC_URI = "http://www.sqlite.org/2015/sqlite-autoconf-${SQLITE_PV}.tar.gz"
 
-SRC_URI[md5sum] = "a18bfc015cd49a1e7a961b7b77bc3b37"
-SRC_URI[sha256sum] = "8382e55a4e7d853c93038562ca3dd00307937fccf1c6b65ddd813e503a56d626"
+SRC_URI[md5sum] = "cd0f883b2ddfc29e8e1bbbbd8e85f555"
+SRC_URI[sha256sum] = "a324143f4cc35cd7e9605a0a8dec9f9e4861d0be8305f3642e7d05008b77e60d"
 
 S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}"
 
Signature · 1 line
2.6.1
author
#2 lore raw
In reply to [email protected]
Quoted 6 lines · On 2015年10月16日 14:28, [email protected] wrote:

From: Kai Kang <[email protected]>

The following changes since commit e35c404537db0b46047fcb2ee7d3645e3e0935c5:

   bitbake: toaster: Don't descend into directories for cached_layers (2015-10-11 08:12:58 +0100)
Quoted 7 lines

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib kangkai/sqlite3
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kangkai/sqlite3

Kai Kang (1):

   sqlite: 3.8.10.2 -> 3.9.0

Ping.

Quoted 7 lines
  .../files/0001-using-the-dynamic-library.patch     | 30 ----------------------
  .../{sqlite3_3.8.10.2.bb => sqlite3_3.9.0.bb}      | 10 ++++----
  2 files changed, 5 insertions(+), 35 deletions(-)

delete mode 100644 meta/recipes-support/sqlite/files/0001-using-the-dynamic-library.patch rename meta/recipes-support/sqlite/{sqlite3_3.8.10.2.bb => sqlite3_3.9.0.bb} (72%)

Signature · 2 lines
Regards,
Neil | Kai Kang
#3 lore raw
Quoted 6 lines · Kang Kai

Kai Kang (1):

Quoted 2 lines
   sqlite: 3.8.10.2 -> 3.9.0

Ping.

As Stephen's weekly status mails show, we're frozen whilst 2.0 is being prepared. This patch has been merged into my staging branch (ross/mut) for when we thaw.

Ross

#4 lore raw
Quoted 7 lines · Ross
Quoted 5 lines · Kang Kai
Quoted 3 lines

Kai Kang (1):

   sqlite: 3.8.10.2 -> 3.9.0
Quoted 5 lines
Quoted 1 line

Ping.

As Stephen's weekly status mails show, we're frozen whilst 2.0 is being prepared. This patch has been merged into my staging branch (ross/mut) for when we thaw.

Hi Ross,

Is there a ross/mut branch of oe-core somewhere? Or only poky?

Quoted 8 lines

Ross

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#5 lore raw
Quoted 2 lines · Andre McCurdy

Is there a ross/mut branch of oe-core somewhere? Or only poky?

Sorry, it's branched from poky for testing purposes and convenience on the autobuilder.

Ross

author
#6 lore raw
In reply to Burton, Ross
Quoted 10 lines · Ross

On 29 October 2015 at 09:17, Kang Kai <[email protected] <mailto:[email protected]>> wrote:

        Kai Kang (1):
           sqlite: 3.8.10.2 -> 3.9.0


    Ping.
Quoted 3 lines

As Stephen's weekly status mails show, we're frozen whilst 2.0 is being prepared. This patch has been merged into my staging branch (ross/mut) for when we thaw.

Ross

Got it. Thanks.

Signature · 2 lines
Regards,
Neil | Kai Kang