Skip to contentSkip to conversation

sqlite3: Update to 3080301

PATCH In review Saul Wold 2 participants 3 messages Feb 24, 2014

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

PATCH 1/2 sqlite3: Update to 3080301

---
 .../sqlite/{sqlite3_3080002.bb => sqlite3_3080301.bb}               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-support/sqlite/{sqlite3_3080002.bb => sqlite3_3080301.bb} (58%)
meta/recipes-support/sqlite/sqlite3_3080301.bb renamed from meta/recipes-support/sqlite/sqlite3_3080002.bb +3 -3
similarity index 58%
rename from meta/recipes-support/sqlite/sqlite3_3080002.bb
rename to meta/recipes-support/sqlite/sqlite3_3080301.bb
index 18ff292..8ed01a9 100644
@@ -2,10 +2,10 @@ require sqlite3.inc
 
 LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0"
 
-SRC_URI = "http://www.sqlite.org/2013/sqlite-autoconf-${PV}.tar.gz"
+SRC_URI = "http://www.sqlite.org/2014/sqlite-autoconf-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "6d6cc639a4da04fbbdda7b1a1a01b386"
-SRC_URI[sha256sum] = "fca3a0a12f94dc92a6d9e700c3f6cab6cd4e79214bd7b6f13717a10f4bcfddb2"
+SRC_URI[md5sum] = "509ff98d8dc9729b618b7e96612079c6"
+SRC_URI[sha256sum] = "de5dc216e9289fabf027f78dbbface32ffc8c6341b7d841d0814b1a452ffdb8c"
 
 S = "${WORKDIR}/sqlite-autoconf-${PV}"
 
Signature · 1 line
1.8.3.1
author
#1 lore raw

PATCH 2/2 sqlite: rename to match upstream versioning

Since we are re-doing the version from a big number down to a dot based number we have to bump the Package Epoch (PE).

---
 .../sqlite/{sqlite3_3080301.bb => sqlite3_3.8.3.1.bb}               | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename meta/recipes-support/sqlite/{sqlite3_3080301.bb => sqlite3_3.8.3.1.bb} (71%)
meta/recipes-support/sqlite/sqlite3_3.8.3.1.bb renamed from meta/recipes-support/sqlite/sqlite3_3080301.bb +4 -2
similarity index 71%
rename from meta/recipes-support/sqlite/sqlite3_3080301.bb
rename to meta/recipes-support/sqlite/sqlite3_3.8.3.1.bb
index 8ed01a9..ca3a05c 100644
@@ -2,12 +2,14 @@ require sqlite3.inc
 
 LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0"
 
-SRC_URI = "http://www.sqlite.org/2014/sqlite-autoconf-${PV}.tar.gz"
+PE = "1"
+SQLITE_PV = "3080301"
+SRC_URI = "http://www.sqlite.org/2014/sqlite-autoconf-${SQLITE_PV}.tar.gz"
 
 SRC_URI[md5sum] = "509ff98d8dc9729b618b7e96612079c6"
 SRC_URI[sha256sum] = "de5dc216e9289fabf027f78dbbface32ffc8c6341b7d841d0814b1a452ffdb8c"
 
-S = "${WORKDIR}/sqlite-autoconf-${PV}"
+S = "${WORKDIR}/sqlite-autoconf-${SQLITE_PV}"
 
 # Provide column meta-data API
 BUILD_CFLAGS += "-DSQLITE_ENABLE_COLUMN_METADATA"
Signature · 1 line
1.8.3.1
#2 lore raw

Re: [PATCH 2/2] sqlite: rename to match upstream versioning

Quoted 22 lines · On Monday 24 February 2014 19:03:13 Saul Wold wrote:

Since we are re-doing the version from a big number down to a dot based number we have to bump the Package Epoch (PE).

---
 .../sqlite/{sqlite3_3080301.bb => sqlite3_3.8.3.1.bb}               | 6
++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
 rename meta/recipes-support/sqlite/{sqlite3_3080301.bb =>

sqlite3_3.8.3.1.bb} (71%)

(quoted diff) +0 -0

b/meta/recipes-support/sqlite/sqlite3_3.8.3.1.bb similarity index 71% rename from meta/recipes-support/sqlite/sqlite3_3080301.bb rename to meta/recipes-support/sqlite/sqlite3_3.8.3.1.bb index 8ed01a9..ca3a05c 100644

meta/recipes-support/sqlite/sqlite3_3.8.3.1.bb renamed from meta/recipes-support/sqlite/sqlite3_3080301.bb +0 -0
@@ -2,12 +2,14 @@ require sqlite3.inc
 
 LIC_FILES_CHKSUM =

"file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0"

meta/recipes-support/sqlite/sqlite3_3.8.3.1.bb require sqlite3.inc · line 7

Quoted 4 lines
meta/recipes-support/sqlite/sqlite3_3.8.3.1.bb renamed from meta/recipes-support/sqlite/sqlite3_3080301.bb +3 -1
-SRC_URI = "http://www.sqlite.org/2014/sqlite-autoconf-${PV}.tar.gz"
+PE = "1"
+SQLITE_PV = "3080301"
+SRC_URI = "http://www.sqlite.org/2014/sqlite-autoconf-${SQLITE_PV}.tar.gz"

Rather than hardcoding this, we could use inline python to compute it. This should work:

def sqlite_download_version(d):

    pvsplit = d.getVar('PV', True).split('.')
    return pvsplit[0] + ''.join([part.rjust(2,'0') for part in pvsplit[1:]])

SQLITE_PV = "${@sqlite_download_version(d)}"

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre