From 1b8a298689a95c1943f18d8d9c24589e64bbc7b7 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Thu, 25 Sep 2014 15:16:33 -0400 Subject: housekeeping: Add a non-numeric PR prefix to allow PRINC in bbappends Although the use of PRINC is deprecated in later versions of Yocto it may still be used and if you are using this layer with older Yocto it is recommended for use in bbappends. It is therefore expected to work. PRINC expects a non-numeric prefix followed by a numeric value, as can be seen in base.bbclass pr_prefix = re.search("\D+",pr) prval = re.search("\d+",pr) if pr_prefix is None or prval is None: bb.error("Unable to analyse format of PR variable: %s" % pr) Failing to stick to this convention yields a parsing error when you attempt to use PRINC: ERROR: Unable to analyse format of PR variable Adding the non-numeric prefix allows PRINC use in bbappends to function correctly. Signed-off-by: Mark Asselstine --- meta-openstack/recipes-devtools/python/python-glanceclient_git.bb | 2 +- meta-openstack/recipes-devtools/python/python-jsonpatch_1.3.bb | 2 +- meta-openstack/recipes-devtools/python/python-jsonpath-rw_1.2.3.bb | 2 +- meta-openstack/recipes-devtools/python/python-jsonpointer_1.1.bb | 2 +- meta-openstack/recipes-devtools/python/python-jsonschema_2.3.0.bb | 2 +- meta-openstack/recipes-devtools/python/python-warlock_1.0.1.bb | 2 +- meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.4.bb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb index 3d978bc..0205c49 100644 --- a/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb +++ b/meta-openstack/recipes-devtools/python/python-glanceclient_git.bb @@ -11,7 +11,7 @@ DEPENDS += " \ SRCREV = "69361a146ecd0cd775579e5dcf34692e9c6328bc" PV = "0.13.1+git${SRCPV}" -PR = "0" +PR = "r0" SRC_URI = "\ git://github.com/openstack/${BPN}.git;protocol=https \ diff --git a/meta-openstack/recipes-devtools/python/python-jsonpatch_1.3.bb b/meta-openstack/recipes-devtools/python/python-jsonpatch_1.3.bb index 4289926..36e0d7b 100644 --- a/meta-openstack/recipes-devtools/python/python-jsonpatch_1.3.bb +++ b/meta-openstack/recipes-devtools/python/python-jsonpatch_1.3.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "BSD+" LIC_FILES_CHKSUM = "file://jsonpatch.py;beginline=3;endline=30;md5=5cd7d1fbd6b236ed142e4285624f58fe" -PR = "0" +PR = "r0" SRCNAME = "jsonpatch" SRC_URI = "http://pypi.python.org/packages/source/j/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" diff --git a/meta-openstack/recipes-devtools/python/python-jsonpath-rw_1.2.3.bb b/meta-openstack/recipes-devtools/python/python-jsonpath-rw_1.2.3.bb index dbd00ec..c213e84 100644 --- a/meta-openstack/recipes-devtools/python/python-jsonpath-rw_1.2.3.bb +++ b/meta-openstack/recipes-devtools/python/python-jsonpath-rw_1.2.3.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "BSD+" LIC_FILES_CHKSUM = "file://README.rst;md5=e3c17535d150260c7235db4e85145fa1" -PR = "0" +PR = "r0" SRCNAME = "jsonpath-rw" SRC_URI = "http://pypi.python.org/packages/source/j/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" diff --git a/meta-openstack/recipes-devtools/python/python-jsonpointer_1.1.bb b/meta-openstack/recipes-devtools/python/python-jsonpointer_1.1.bb index 712fce0..3bdb159 100644 --- a/meta-openstack/recipes-devtools/python/python-jsonpointer_1.1.bb +++ b/meta-openstack/recipes-devtools/python/python-jsonpointer_1.1.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://jsonpointer.py;beginline=3;endline=31;md5=5e663c88967b53590856107a043d605c" -PR = "0" +PR = "r0" SRCNAME = "jsonpointer" SRC_URI = "http://pypi.python.org/packages/source/j/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" diff --git a/meta-openstack/recipes-devtools/python/python-jsonschema_2.3.0.bb b/meta-openstack/recipes-devtools/python/python-jsonschema_2.3.0.bb index a24464d..e5d3018 100644 --- a/meta-openstack/recipes-devtools/python/python-jsonschema_2.3.0.bb +++ b/meta-openstack/recipes-devtools/python/python-jsonschema_2.3.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8" -PR = "0" +PR = "r0" SRCNAME = "jsonschema" SRC_URI = "http://pypi.python.org/packages/source/j/${SRCNAME}/${SRCNAME}-${PV}.zip" diff --git a/meta-openstack/recipes-devtools/python/python-warlock_1.0.1.bb b/meta-openstack/recipes-devtools/python/python-warlock_1.0.1.bb index 4bc4c74..babd0f5 100644 --- a/meta-openstack/recipes-devtools/python/python-warlock_1.0.1.bb +++ b/meta-openstack/recipes-devtools/python/python-warlock_1.0.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://README.md;md5=97b002bcda83d22e7d3fd1427688a6a6" DEPENDS += "python-jsonschema python-jsonpatch" -PR = "0" +PR = "r0" SRCNAME = "warlock" SRC_URI = "http://pypi.python.org/packages/source/w/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.4.bb b/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.4.bb index baa186b..5f6c7c8 100644 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.4.bb +++ b/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.4.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" -PR = "0" +PR = "r0" SRC_URI = "https://launchpad.net/cloud-init/trunk/${PV}/+download/${BPN}-${PV}.tar.gz \ file://cloud-init-source-local-lsb-functions.patch \ -- cgit v1.2.3-54-g00ecf