From a5e4c0f279b6101436820dbb6b3da3d06131c12d Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 9 Nov 2015 12:21:10 +1100 Subject: [PATCH] Clear out some duplicate package dependencies I think these duplicate dependencies came in because we were not correctly always installing "general" packages (see Ie1b8d09369281059d21da61b2725a457f708ae9e) Most of these are just extras for the lxml dependencies; I added zlib devel to general for glance (seems pretty generic), and then that can go too, as all other packages are specified. Change-Id: I44b14ca15c64fad9daf1ac8d851704b02ea2eae0 --- files/debs/ceilometer-collector | 3 --- files/debs/general | 1 + files/debs/glance | 6 ------ files/debs/nova | 2 -- files/debs/tempest | 2 -- files/debs/trove | 1 - files/rpms/general | 1 + files/rpms/glance | 6 ------ files/rpms/keystone | 1 - files/rpms/tempest | 1 - files/rpms/trove | 1 - 11 files changed, 2 insertions(+), 23 deletions(-) delete mode 100644 files/debs/glance delete mode 100644 files/debs/tempest delete mode 100644 files/debs/trove delete mode 100644 files/rpms/glance delete mode 100644 files/rpms/tempest delete mode 100644 files/rpms/trove diff --git a/files/debs/ceilometer-collector b/files/debs/ceilometer-collector index f1b692ac71..94c82e0843 100644 --- a/files/debs/ceilometer-collector +++ b/files/debs/ceilometer-collector @@ -1,6 +1,3 @@ python-pymongo #NOPRIME mongodb-server #NOPRIME libnspr4-dev -pkg-config -libxml2-dev -libxslt-dev \ No newline at end of file diff --git a/files/debs/general b/files/debs/general index 7bc90a6864..58d1e8b3f5 100644 --- a/files/debs/general +++ b/files/debs/general @@ -29,3 +29,4 @@ openjdk-7-jre-headless # NOPRIME pkg-config libmysqlclient-dev # MySQL-python libpq-dev # psycopg2 +zlib1g-dev diff --git a/files/debs/glance b/files/debs/glance deleted file mode 100644 index 37877a85c2..0000000000 --- a/files/debs/glance +++ /dev/null @@ -1,6 +0,0 @@ -libmysqlclient-dev -libpq-dev -libssl-dev -libxml2-dev -libxslt1-dev -zlib1g-dev diff --git a/files/debs/nova b/files/debs/nova index d1678a7a6f..fa394e734b 100644 --- a/files/debs/nova +++ b/files/debs/nova @@ -8,8 +8,6 @@ libmysqlclient-dev mysql-server # NOPRIME python-mysqldb python-mysql.connector -libxml2-dev # needed for building lxml -libxslt1-dev gawk iptables ebtables diff --git a/files/debs/tempest b/files/debs/tempest deleted file mode 100644 index bb095297e0..0000000000 --- a/files/debs/tempest +++ /dev/null @@ -1,2 +0,0 @@ -libxml2-dev -libxslt1-dev diff --git a/files/debs/trove b/files/debs/trove deleted file mode 100644 index 96f8f29277..0000000000 --- a/files/debs/trove +++ /dev/null @@ -1 +0,0 @@ -libxslt1-dev diff --git a/files/rpms/general b/files/rpms/general index 2a45227e0f..eb479d2050 100644 --- a/files/rpms/general +++ b/files/rpms/general @@ -32,3 +32,4 @@ iptables-services # NOPRIME f21,f22 mariadb-devel # MySQL-python postgresql-devel # psycopg2 redhat-rpm-config # MySQL-python rhbz-1195207 f21 +zlib-devel diff --git a/files/rpms/glance b/files/rpms/glance deleted file mode 100644 index 479194f918..0000000000 --- a/files/rpms/glance +++ /dev/null @@ -1,6 +0,0 @@ -libxml2-devel -libxslt-devel -mysql-devel -openssl-devel -postgresql-devel -zlib-devel diff --git a/files/rpms/keystone b/files/rpms/keystone index 8074119fdb..7384150a4a 100644 --- a/files/rpms/keystone +++ b/files/rpms/keystone @@ -1,4 +1,3 @@ MySQL-python -libxslt-devel sqlite mod_ssl diff --git a/files/rpms/tempest b/files/rpms/tempest deleted file mode 100644 index e7bbd43cd6..0000000000 --- a/files/rpms/tempest +++ /dev/null @@ -1 +0,0 @@ -libxslt-devel diff --git a/files/rpms/trove b/files/rpms/trove deleted file mode 100644 index e7bbd43cd6..0000000000 --- a/files/rpms/trove +++ /dev/null @@ -1 +0,0 @@ -libxslt-devel