openstack/devstack
Code Issues Proposed changes

Move devlib packages into "general"

Browse Source 
The removal of the wheel caching code
(Ia140dc34638d893b92f66d1ba20efd9522c5923b) removed the install of the
"devlib" packages, which was being done with a call in
tools/build_wheels.sh

The idea of "devlibs" and "general" seems to be pretty much the same
thing -- global build requirements.  I have removed the unused devlibs
files, and moved any missing packages into the "general" package
install file.

Change-Id: I8f34a164d6785a122394b42387d4221a7b447ae1
This commit is contained in:
Ian Wienand 2015-11-09 12:02:51 +11:00
parent b8509f09d6
commit a7e0b39a64
6 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
files/debs/devlibs
View File

@ -1,7 +0,0 @@
libffi-dev # pyOpenSSL
libmysqlclient-dev # MySQL-python
libpq-dev # psycopg2
libssl-dev # pyOpenSSL
libxml2-dev # lxml
libxslt1-dev # lxml
python-dev # pyOpenSSL

2
files/debs/general
View File

@ -27,3 +27,5 @@ libxslt1-dev # lxml
gettext # used for compiling message catalogs gettext # used for compiling message catalogs
openjdk-7-jre-headless # NOPRIME openjdk-7-jre-headless # NOPRIME
pkg-config pkg-config
libmysqlclient-dev # MySQL-python
libpq-dev # psycopg2

6
files/rpms-suse/devlibs
View File

@ -1,6 +0,0 @@
libffi-devel # pyOpenSSL
libopenssl-devel # pyOpenSSL
libxslt-devel # lxml
postgresql-devel # psycopg2
libmysqlclient-devel # MySQL-python
python-devel # pyOpenSSL

5
files/rpms-suse/general
View File

@ -21,3 +21,8 @@ tcpdump
unzip unzip
wget wget
net-tools net-tools
libffi-devel # pyOpenSSL
libxslt-devel # lxml
postgresql-devel # psycopg2
libmysqlclient-devel # MySQL-python
python-devel # pyOpenSSL

8
files/rpms/devlibs
View File

@ -1,8 +0,0 @@
libffi-devel # pyOpenSSL
libxml2-devel # lxml
libxslt-devel # lxml
mariadb-devel # MySQL-python
openssl-devel # pyOpenSSL
postgresql-devel # psycopg2
python-devel # pyOpenSSL
redhat-rpm-config # MySQL-python rhbz-1195207 f21

7
files/rpms/general
View File

@ -10,8 +10,8 @@ openssh-server
openssl openssl
openssl-devel # to rebuild pyOpenSSL if needed openssl-devel # to rebuild pyOpenSSL if needed
libffi-devel libffi-devel
libxml2-devel libxml2-devel # lxml
libxslt-devel libxslt-devel # lxml
pkgconfig pkgconfig
psmisc psmisc
python-devel python-devel
@ -29,3 +29,6 @@ java-1.7.0-openjdk-headless # NOPRIME rhel7
java-1.8.0-openjdk-headless # NOPRIME f21,f22 java-1.8.0-openjdk-headless # NOPRIME f21,f22
pyOpenSSL # version in pip uses too much memory pyOpenSSL # version in pip uses too much memory
iptables-services # NOPRIME f21,f22 iptables-services # NOPRIME f21,f22
mariadb-devel # MySQL-python
postgresql-devel # psycopg2
redhat-rpm-config # MySQL-python rhbz-1195207 f21