From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 10 Nov 2020 10:20:56 +0000 (+0100)
Subject: trim build image components that involve python2 rpms that no longer make sense
X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=934580618375af290daf15b46196c605dbbc3af5

trim build image components that involve python2 rpms that no longer make sense
---

diff --git a/config.lxc/devel.pkgs b/config.lxc/devel.pkgs
index 12b398c6..26e4a27e 100644
--- a/config.lxc/devel.pkgs
+++ b/config.lxc/devel.pkgs
@@ -35,10 +35,10 @@ package: doxygen
 package: cronie
 package: xmlsec1 xmlsec1-openssl
 package: expat-devel
-package: db4-devel
 package: ncurses-devel
 package: readline-devel
 package: dnsmasq
+package <= f31: db4-devel
 # for spec2make / rpmlib
 package=f8: popt-devel
 # kernel
@@ -117,16 +117,19 @@ package>=f16: kernel-modules-extra
 package=centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@
 ##########
 # for sfa : rebuilding wsdl index at build-time
-package<=f25: python-uuid
-package: pyOpenSSL m2crypto
-package: libxml2-python libxslt-python
-package<=f27: python-ZSI
-package: python-psycopg2
-package: python-setuptools
-package: python-dateutil
-package: python-lxml
+# removing from the build image, defer installation
+# that depends on the flavour of python2 or 3
+# + in f33 the rpms primarily are gone
+#package<=f25: python-uuid
+#package: pyOpenSSL m2crypto
+#package: libxml2-python libxslt-python
+#package<=f27: python-ZSI
+#package: python2-psycopg2
+#package: python2-setuptools
+#package: python2-dateutil
+#package: python2-lxml
 # hopefully temporary, for sfa@python2
-package>=f29: python2-dateutil python2-lxml
+#package>=f29: python2-dateutil python2-lxml
 # DistributedRateLimiting
 package: libxml2-devel
 # myplc-docs