aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2014-09-25 15:16:33 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-09-29 00:48:27 -0400
commitde48084e062d8ec186a181155d36b63bdc201742 (patch)
treeafede397c7fc900f090ef76156928c36bbdf7384
parent65c6f6c3236b39e661578a5381d82175e331ac9f (diff)
downloadmeta-cloud-services-icehouse.tar.gz
meta-cloud-services-icehouse.tar.bz2
meta-cloud-services-icehouse.zip
housekeeping: Add a non-numeric PR prefix to allow PRINC in bbappendsicehouse
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 <mark.asselstine@windriver.com>
-rw-r--r--meta-openstack/recipes-devtools/python/python-glanceclient_git.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-jsonpatch_1.3.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-jsonpath-rw_1.2.3.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-jsonpointer_1.1.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-jsonschema_2.3.0.bb2
-rw-r--r--meta-openstack/recipes-devtools/python/python-warlock_1.0.1.bb2
-rw-r--r--meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.4.bb2
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 80b166e1..29f6bb58 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 = "3c16d23293e5ee977c0a62e012e83c1247844255"
PV = "0.12.0+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 42899264..36e0d7b6 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 dbd00ec4..c213e848 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 712fce0e..3bdb1592 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 a24464da..e5d30181 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 4bc4c742..babd0f54 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 9e460a7f..8e0d7a75 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 \