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
diff --git a/files/debs/devlibs b/files/debs/devlibs
deleted file mode 100644
index 0446ceb..0000000
--- a/files/debs/devlibs
+++ /dev/null
@@ -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
diff --git a/files/debs/general b/files/debs/general
index 80e81f5..7bc90a6 100644
--- a/files/debs/general
+++ b/files/debs/general
@@ -27,3 +27,5 @@
gettext # used for compiling message catalogs
openjdk-7-jre-headless # NOPRIME
pkg-config
+libmysqlclient-dev # MySQL-python
+libpq-dev # psycopg2
diff --git a/files/rpms-suse/devlibs b/files/rpms-suse/devlibs
deleted file mode 100644
index 54d13a3..0000000
--- a/files/rpms-suse/devlibs
+++ /dev/null
@@ -1,6 +0,0 @@
-libffi-devel # pyOpenSSL
-libopenssl-devel # pyOpenSSL
-libxslt-devel # lxml
-postgresql-devel # psycopg2
-libmysqlclient-devel # MySQL-python
-python-devel # pyOpenSSL
diff --git a/files/rpms-suse/general b/files/rpms-suse/general
index 42756d8..3a7c4b5 100644
--- a/files/rpms-suse/general
+++ b/files/rpms-suse/general
@@ -21,3 +21,8 @@
unzip
wget
net-tools
+libffi-devel # pyOpenSSL
+libxslt-devel # lxml
+postgresql-devel # psycopg2
+libmysqlclient-devel # MySQL-python
+python-devel # pyOpenSSL
diff --git a/files/rpms/devlibs b/files/rpms/devlibs
deleted file mode 100644
index 385ed3b..0000000
--- a/files/rpms/devlibs
+++ /dev/null
@@ -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
diff --git a/files/rpms/general b/files/rpms/general
index c3f3de8..2a45227 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -10,8 +10,8 @@
openssl
openssl-devel # to rebuild pyOpenSSL if needed
libffi-devel
-libxml2-devel
-libxslt-devel
+libxml2-devel # lxml
+libxslt-devel # lxml
pkgconfig
psmisc
python-devel
@@ -29,3 +29,6 @@
java-1.8.0-openjdk-headless # NOPRIME f21,f22
pyOpenSSL # version in pip uses too much memory
iptables-services # NOPRIME f21,f22
+mariadb-devel # MySQL-python
+postgresql-devel # psycopg2
+redhat-rpm-config # MySQL-python rhbz-1195207 f21