diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-03-10 13:57:10 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-03-10 14:01:05 -0400 |
commit | 825048fe5ef82644ae5bb2833e71b295e759d7e1 (patch) | |
tree | 6e625274dbfac874ebe477d31db9cddc4f65534a /meta-openstack/recipes-devtools/python/python-horizon_git.bb | |
parent | b1a41b17310a3081aeead1b7b9c2056e8f04ab14 (diff) | |
download | meta-cloud-services-825048fe5ef82644ae5bb2833e71b295e759d7e1.tar.gz |
core: BROKEN: Initial update to kilo branches and REVs
This is the initial update to the kilo branches and SRCREVs for some
of the core projects.
These are known to NOT work, due to SSLv3 issues with oe-core, and
missing config/dependencies.
Incremental updates will fix issues with the components, but they are
best done in-tree, rather than sitting on a huge pile of changes.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-horizon_git.bb')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-horizon_git.bb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_git.bb b/meta-openstack/recipes-devtools/python/python-horizon_git.bb index 47f6a7c..154c447 100644 --- a/meta-openstack/recipes-devtools/python/python-horizon_git.bb +++ b/meta-openstack/recipes-devtools/python/python-horizon_git.bb | |||
@@ -37,6 +37,7 @@ RDEPENDS_${PN} += " python-django \ | |||
37 | python-xstatic-angular \ | 37 | python-xstatic-angular \ |
38 | python-xstatic-angular-cookies \ | 38 | python-xstatic-angular-cookies \ |
39 | python-xstatic-angular-mock \ | 39 | python-xstatic-angular-mock \ |
40 | python-xstatic-angular-bootstrap \ | ||
40 | python-xstatic-d3 \ | 41 | python-xstatic-d3 \ |
41 | python-xstatic-hogan \ | 42 | python-xstatic-hogan \ |
42 | python-xstatic-jasmine \ | 43 | python-xstatic-jasmine \ |
@@ -51,6 +52,8 @@ RDEPENDS_${PN} += " python-django \ | |||
51 | python-xstatic-bootstrap-scss \ | 52 | python-xstatic-bootstrap-scss \ |
52 | python-xstatic-font-awesome \ | 53 | python-xstatic-font-awesome \ |
53 | python-xstatic-jquery-ui \ | 54 | python-xstatic-jquery-ui \ |
55 | python-xstatic-smart-table \ | ||
56 | python-xstatic-term.js \ | ||
54 | python-pyscss \ | 57 | python-pyscss \ |
55 | python-django-pyscss \ | 58 | python-django-pyscss \ |
56 | " | 59 | " |
@@ -58,7 +61,7 @@ RDEPENDS_${PN} += " python-django \ | |||
58 | PR = "r3" | 61 | PR = "r3" |
59 | SRCNAME = "horizon" | 62 | SRCNAME = "horizon" |
60 | 63 | ||
61 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \ | 64 | SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ |
62 | file://horizon.init \ | 65 | file://horizon.init \ |
63 | file://fix_bindir_path.patch \ | 66 | file://fix_bindir_path.patch \ |
64 | file://openstack-dashboard-apache.conf \ | 67 | file://openstack-dashboard-apache.conf \ |
@@ -66,8 +69,8 @@ SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=stable/juno \ | |||
66 | file://horizon-use-full-package-path-to-test-directories.patch \ | 69 | file://horizon-use-full-package-path-to-test-directories.patch \ |
67 | " | 70 | " |
68 | 71 | ||
69 | SRCREV="ed895a181db0c75000cd0ef34ac0d769a295424c" | 72 | SRCREV="9b37723a21e88c29732e2a4a9eeeecb9ecf19204" |
70 | PV="2014.2+git${SRCPV}" | 73 | PV="2015.1.0b2+git${SRCPV}" |
71 | S = "${WORKDIR}/git" | 74 | S = "${WORKDIR}/git" |
72 | 75 | ||
73 | inherit setuptools update-rc.d python-dir default_configs openstackchef monitor | 76 | inherit setuptools update-rc.d python-dir default_configs openstackchef monitor |