diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2014-09-25 15:16:33 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-09-29 00:48:27 -0400 |
commit | de48084e062d8ec186a181155d36b63bdc201742 (patch) | |
tree | afede397c7fc900f090ef76156928c36bbdf7384 | |
parent | 65c6f6c3236b39e661578a5381d82175e331ac9f (diff) | |
download | meta-cloud-services-icehouse.tar.gz |
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>
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 80b166e..29f6bb5 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 | ||
12 | SRCREV = "3c16d23293e5ee977c0a62e012e83c1247844255" | 12 | SRCREV = "3c16d23293e5ee977c0a62e012e83c1247844255" |
13 | PV = "0.12.0+git${SRCPV}" | 13 | PV = "0.12.0+git${SRCPV}" |
14 | PR = "0" | 14 | PR = "r0" |
15 | 15 | ||
16 | SRC_URI = "\ | 16 | SRC_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" | |||
4 | LICENSE = "BSD+" | 4 | LICENSE = "BSD+" |
5 | LIC_FILES_CHKSUM = "file://jsonpatch.py;beginline=3;endline=30;md5=5cd7d1fbd6b236ed142e4285624f58fe" | 5 | LIC_FILES_CHKSUM = "file://jsonpatch.py;beginline=3;endline=30;md5=5cd7d1fbd6b236ed142e4285624f58fe" |
6 | 6 | ||
7 | PR = "0" | 7 | PR = "r0" |
8 | SRCNAME = "jsonpatch" | 8 | SRCNAME = "jsonpatch" |
9 | 9 | ||
10 | SRC_URI = "http://pypi.python.org/packages/source/j/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" | 10 | 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" | |||
4 | LICENSE = "BSD+" | 4 | LICENSE = "BSD+" |
5 | LIC_FILES_CHKSUM = "file://README.rst;md5=e3c17535d150260c7235db4e85145fa1" | 5 | LIC_FILES_CHKSUM = "file://README.rst;md5=e3c17535d150260c7235db4e85145fa1" |
6 | 6 | ||
7 | PR = "0" | 7 | PR = "r0" |
8 | SRCNAME = "jsonpath-rw" | 8 | SRCNAME = "jsonpath-rw" |
9 | 9 | ||
10 | SRC_URI = "http://pypi.python.org/packages/source/j/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" | 10 | 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" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://jsonpointer.py;beginline=3;endline=31;md5=5e663c88967b53590856107a043d605c" | 5 | LIC_FILES_CHKSUM = "file://jsonpointer.py;beginline=3;endline=31;md5=5e663c88967b53590856107a043d605c" |
6 | 6 | ||
7 | PR = "0" | 7 | PR = "r0" |
8 | SRCNAME = "jsonpointer" | 8 | SRCNAME = "jsonpointer" |
9 | 9 | ||
10 | SRC_URI = "http://pypi.python.org/packages/source/j/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" | 10 | 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" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8" | 5 | LIC_FILES_CHKSUM = "file://COPYING;md5=7a60a81c146ec25599a3e1dabb8610a8" |
6 | 6 | ||
7 | PR = "0" | 7 | PR = "r0" |
8 | SRCNAME = "jsonschema" | 8 | SRCNAME = "jsonschema" |
9 | 9 | ||
10 | SRC_URI = "http://pypi.python.org/packages/source/j/${SRCNAME}/${SRCNAME}-${PV}.zip" | 10 | 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" | |||
6 | 6 | ||
7 | DEPENDS += "python-jsonschema python-jsonpatch" | 7 | DEPENDS += "python-jsonschema python-jsonpatch" |
8 | 8 | ||
9 | PR = "0" | 9 | PR = "r0" |
10 | SRCNAME = "warlock" | 10 | SRCNAME = "warlock" |
11 | 11 | ||
12 | SRC_URI = "http://pypi.python.org/packages/source/w/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" | 12 | 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 9e460a7..8e0d7a7 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" | |||
4 | LICENSE = "GPLv3" | 4 | LICENSE = "GPLv3" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" |
6 | 6 | ||
7 | PR = "0" | 7 | PR = "r0" |
8 | 8 | ||
9 | SRC_URI = "https://launchpad.net/cloud-init/trunk/${PV}/+download/${BPN}-${PV}.tar.gz \ | 9 | SRC_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 \ |