summaryrefslogtreecommitdiffstats
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:47:44 -0400
commit1b8a298689a95c1943f18d8d9c24589e64bbc7b7 (patch)
treefa047fde30d9cce1ba54be0671f2bb9be11e4b4a
parent3c67c3601db5d9510ff8bb1082aed703e4125092 (diff)
downloadmeta-cloud-services-1b8a298689a95c1943f18d8d9c24589e64bbc7b7.tar.gz
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 <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 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 += " \
11 11
12SRCREV = "69361a146ecd0cd775579e5dcf34692e9c6328bc" 12SRCREV = "69361a146ecd0cd775579e5dcf34692e9c6328bc"
13PV = "0.13.1+git${SRCPV}" 13PV = "0.13.1+git${SRCPV}"
14PR = "0" 14PR = "r0"
15 15
16SRC_URI = "\ 16SRC_URI = "\
17 git://github.com/openstack/${BPN}.git;protocol=https \ 17 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"
4LICENSE = "BSD+" 4LICENSE = "BSD+"
5LIC_FILES_CHKSUM = "file://jsonpatch.py;beginline=3;endline=30;md5=5cd7d1fbd6b236ed142e4285624f58fe" 5LIC_FILES_CHKSUM = "file://jsonpatch.py;beginline=3;endline=30;md5=5cd7d1fbd6b236ed142e4285624f58fe"
6 6
7PR = "0" 7PR = "r0"
8SRCNAME = "jsonpatch" 8SRCNAME = "jsonpatch"
9 9
10SRC_URI = "http://pypi.python.org/packages/source/j/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" 10SRC_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"
4LICENSE = "BSD+" 4LICENSE = "BSD+"
5LIC_FILES_CHKSUM = "file://README.rst;md5=e3c17535d150260c7235db4e85145fa1" 5LIC_FILES_CHKSUM = "file://README.rst;md5=e3c17535d150260c7235db4e85145fa1"
6 6
7PR = "0" 7PR = "r0"
8SRCNAME = "jsonpath-rw" 8SRCNAME = "jsonpath-rw"
9 9
10SRC_URI = "http://pypi.python.org/packages/source/j/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" 10SRC_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"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://jsonpointer.py;beginline=3;endline=31;md5=5e663c88967b53590856107a043d605c" 5LIC_FILES_CHKSUM = "file://jsonpointer.py;beginline=3;endline=31;md5=5e663c88967b53590856107a043d605c"
6 6
7PR = "0" 7PR = "r0"
8SRCNAME = "jsonpointer" 8SRCNAME = "jsonpointer"
9 9
10SRC_URI = "http://pypi.python.org/packages/source/j/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" 10SRC_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"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8" 5LIC_FILES_CHKSUM = "file://COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8"
6 6
7PR = "0" 7PR = "r0"
8SRCNAME = "jsonschema" 8SRCNAME = "jsonschema"
9 9
10SRC_URI = "http://pypi.python.org/packages/source/j/${SRCNAME}/${SRCNAME}-${PV}.zip" 10SRC_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"
6 6
7DEPENDS += "python-jsonschema python-jsonpatch" 7DEPENDS += "python-jsonschema python-jsonpatch"
8 8
9PR = "0" 9PR = "r0"
10SRCNAME = "warlock" 10SRCNAME = "warlock"
11 11
12SRC_URI = "http://pypi.python.org/packages/source/w/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" 12SRC_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"
4LICENSE = "GPLv3" 4LICENSE = "GPLv3"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
6 6
7PR = "0" 7PR = "r0"
8 8
9SRC_URI = "https://launchpad.net/cloud-init/trunk/${PV}/+download/${BPN}-${PV}.tar.gz \ 9SRC_URI = "https://launchpad.net/cloud-init/trunk/${PV}/+download/${BPN}-${PV}.tar.gz \
10 file://cloud-init-source-local-lsb-functions.patch \ 10 file://cloud-init-source-local-lsb-functions.patch \