fix requirements.txt in manila-ui and python-manilaclient
That packages has requirements. It makes the fpm build wrong packages for ubuntu. Easiest way to avoid problem --- just ignore some requirements when building the packages. It's simple and it works because we know that on ubuntu that dependencies already satisfied. Change-Id: I0a2885531444806d4a17cdd5e601db08417e3a6b
This commit is contained in:
parent
95967424c9
commit
02992d6c80
|
@ -5,12 +5,15 @@
|
|||
[submodule "repositories/python/manila-ui"]
|
||||
path = repositories/python/manila-ui
|
||||
url = https://github.com/openstack/manila-ui.git
|
||||
branch = stable/mitaka
|
||||
[submodule "repositories/python/python-manilaclient"]
|
||||
path = repositories/python/python-manilaclient
|
||||
url = https://github.com/openstack/python-manilaclient.git
|
||||
branch = stable/mitaka
|
||||
[submodule "repositories/python/manila"]
|
||||
path = repositories/python/manila
|
||||
url = https://github.com/openstack/manila.git
|
||||
branch = stable/mitaka
|
||||
[submodule "plugin_test/fuel-qa"]
|
||||
path = plugin_test/fuel-qa
|
||||
url = https://github.com/openstack/fuel-qa.git
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
# update submodules for core puppet manifests
|
||||
git submodule update --remote deployment_scripts/puppet/modules/manila
|
||||
git submodule update
|
||||
|
||||
function build_deb {
|
||||
fpm -v $1 -s python -t deb --python-install-bin /usr/bin --python-install-lib /usr/lib/python2.7/dist-packages/ $2/setup.py
|
||||
|
@ -11,8 +10,15 @@ function build_deb {
|
|||
rm repositories/ubuntu/*
|
||||
cd repositories/python
|
||||
|
||||
build_deb 2.1.1 manila-ui
|
||||
build_deb "1:2.0.1" manila
|
||||
|
||||
sed -i s/'python-keystoneclient'/'#python-keystoneclient'/ manila-ui/requirements.txt
|
||||
build_deb 2.1.1 manila-ui
|
||||
cd manila-ui; git checkout stable/mitaka; git checkout -- requirements.txt; cd ..
|
||||
|
||||
sed -i s/'python-keystoneclient'/'#python-keystoneclient'/ python-manilaclient/requirements.txt
|
||||
sed -i s/'pycrypto'/'#pycrypto'/ python-manilaclient/requirements.txt
|
||||
build_deb 1.8.2 python-manilaclient
|
||||
cd python-manilaclient; git checkout -- requirements.txt; cd ..
|
||||
|
||||
mv *.deb ../ubuntu
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit d5f4110588bc7cb6d4f7a612f28a15d7d9a033ef
|
||||
Subproject commit 3c3e723b07eba725ed5c5a8e46fb8b0ed6232ae0
|
|
@ -1 +1 @@
|
|||
Subproject commit d770bef5471024d4c41b02f9aa60935b9f511d95
|
||||
Subproject commit a919058515d7210cd448b0646c4592d6efeb7e73
|
Loading…
Reference in New Issue