diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-nova_git.bb')
| -rw-r--r-- | meta-openstack/recipes-devtools/python/python-nova_git.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-nova_git.bb b/meta-openstack/recipes-devtools/python/python-nova_git.bb index 929adff..6afe3bd 100644 --- a/meta-openstack/recipes-devtools/python/python-nova_git.bb +++ b/meta-openstack/recipes-devtools/python/python-nova_git.bb | |||
| @@ -11,14 +11,15 @@ SRCNAME = "nova" | |||
| 11 | 11 | ||
| 12 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}" | 12 | FILESEXTRAPATHS_append := "${THISDIR}/${PN}" |
| 13 | 13 | ||
| 14 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ | 14 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \ |
| 15 | file://nova-add-migrate.cfg-to-the-MANIFEST.patch \ | 15 | file://nova-add-migrate.cfg-to-the-MANIFEST.patch \ |
| 16 | file://nova-convert-path-from-relative-to-absolute.patch \ | 16 | file://nova-convert-path-from-relative-to-absolute.patch \ |
| 17 | file://nova-fix-location-to-doc-directory.patch \ | 17 | file://nova-fix-location-to-doc-directory.patch \ |
| 18 | file://nova-fix-location-to-plugin-directory.patch \ | 18 | file://nova-fix-location-to-plugin-directory.patch \ |
| 19 | file://neutron-api-set-default-binding-vnic_type.patch \ | 19 | file://neutron-api-set-default-binding-vnic_type.patch \ |
| 20 | file://websocketproxy-allow-empty-schemes-at-python-2.7.3.patch \ | ||
| 21 | " | 20 | " |
| 21 | # restore post stable/juno: | ||
| 22 | # file://websocketproxy-allow-empty-schemes-at-python-2.7.3.patch | ||
| 22 | 23 | ||
| 23 | SRC_URI += "file://nova-all \ | 24 | SRC_URI += "file://nova-all \ |
| 24 | file://nova.init \ | 25 | file://nova.init \ |
| @@ -26,7 +27,7 @@ SRC_URI += "file://nova-all \ | |||
| 26 | file://nova.conf \ | 27 | file://nova.conf \ |
| 27 | file://openrc \ | 28 | file://openrc \ |
| 28 | " | 29 | " |
| 29 | SRCREV="943f02f1a62f7eb131f62729d83d97ad431ee89f" | 30 | SRCREV="9c3ec16576e2f7c9d5aff6e4b620d708e6636568" |
| 30 | PV="2014.2+git${SRCPV}" | 31 | PV="2014.2+git${SRCPV}" |
| 31 | 32 | ||
| 32 | S = "${WORKDIR}/git" | 33 | S = "${WORKDIR}/git" |
