Patchwork [2/2] sqlite: rename to match upstream versioning

login
register
mail settings
Submitter Saul Wold
Date Feb. 24, 2014, 5:03 p.m.
Message ID <1393261393-9602-2-git-send-email-sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/67283/
State New
Headers show

Comments

Saul Wold - Feb. 24, 2014, 5:03 p.m.
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).

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 .../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%)
Paul Eggleton - Feb. 24, 2014, 5:23 p.m.
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).
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  .../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%)
> 
> diff --git a/meta/recipes-support/sqlite/sqlite3_3080301.bb
> 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
> --- a/meta/recipes-support/sqlite/sqlite3_3080301.bb
> +++ b/meta/recipes-support/sqlite/sqlite3_3.8.3.1.bb
> @@ -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"

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

Patch

diff --git a/meta/recipes-support/sqlite/sqlite3_3080301.bb 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
--- a/meta/recipes-support/sqlite/sqlite3_3080301.bb
+++ b/meta/recipes-support/sqlite/sqlite3_3.8.3.1.bb
@@ -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"