Browse code

Move devlib packages into "general"

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

Ian Wienand authored on 2015/11/09 10:02:51
Showing 6 changed files
1 1
deleted file mode 100644
... ...
@@ -1,7 +0,0 @@
1
-libffi-dev  # pyOpenSSL
2
-libmysqlclient-dev  # MySQL-python
3
-libpq-dev  # psycopg2
4
-libssl-dev  # pyOpenSSL
5
-libxml2-dev  # lxml
6
-libxslt1-dev  # lxml
7
-python-dev  # pyOpenSSL
... ...
@@ -27,3 +27,5 @@ libxslt1-dev  # lxml
27 27
 gettext  # used for compiling message catalogs
28 28
 openjdk-7-jre-headless  # NOPRIME
29 29
 pkg-config
30
+libmysqlclient-dev  # MySQL-python
31
+libpq-dev  # psycopg2
30 32
deleted file mode 100644
... ...
@@ -1,6 +0,0 @@
1
-libffi-devel  # pyOpenSSL
2
-libopenssl-devel  # pyOpenSSL
3
-libxslt-devel  # lxml
4
-postgresql-devel  # psycopg2
5
-libmysqlclient-devel # MySQL-python
6
-python-devel  # pyOpenSSL
... ...
@@ -21,3 +21,8 @@ tcpdump
21 21
 unzip
22 22
 wget
23 23
 net-tools
24
+libffi-devel  # pyOpenSSL
25
+libxslt-devel  # lxml
26
+postgresql-devel  # psycopg2
27
+libmysqlclient-devel # MySQL-python
28
+python-devel  # pyOpenSSL
24 29
deleted file mode 100644
... ...
@@ -1,8 +0,0 @@
1
-libffi-devel  # pyOpenSSL
2
-libxml2-devel  # lxml
3
-libxslt-devel  # lxml
4
-mariadb-devel  # MySQL-python
5
-openssl-devel  # pyOpenSSL
6
-postgresql-devel  # psycopg2
7
-python-devel  # pyOpenSSL
8
-redhat-rpm-config # MySQL-python rhbz-1195207 f21
... ...
@@ -10,8 +10,8 @@ openssh-server
10 10
 openssl
11 11
 openssl-devel # to rebuild pyOpenSSL if needed
12 12
 libffi-devel
13
-libxml2-devel
14
-libxslt-devel
13
+libxml2-devel # lxml
14
+libxslt-devel # lxml
15 15
 pkgconfig
16 16
 psmisc
17 17
 python-devel
... ...
@@ -29,3 +29,6 @@ java-1.7.0-openjdk-headless  # NOPRIME rhel7
29 29
 java-1.8.0-openjdk-headless  # NOPRIME f21,f22
30 30
 pyOpenSSL # version in pip uses too much memory
31 31
 iptables-services  # NOPRIME f21,f22
32
+mariadb-devel  # MySQL-python
33
+postgresql-devel  # psycopg2
34
+redhat-rpm-config # MySQL-python rhbz-1195207 f21