X-Git-Url: http://git.onelab.eu/?p=build.git;a=blobdiff_plain;f=config.lxc%2Fdevel.pkgs;h=26e4a27ea1215b0041090024a4664d1415a487b4;hp=d4eb662cce8adb539628cee22b58de5a48dcc318;hb=934580618375af290daf15b46196c605dbbc3af5;hpb=a485a57cb0873ae089965ccec6c8ad59dbf39808

diff --git a/config.lxc/devel.pkgs b/config.lxc/devel.pkgs
index d4eb662c..26e4a27e 100644
--- a/config.lxc/devel.pkgs
+++ b/config.lxc/devel.pkgs
@@ -3,85 +3,91 @@ groupname: PlanetLabDevel
 groupdesc: Building PlanetLab
 #
 # general utilities
-package: sendmail sendmail-cf mailx 
+package: sendmail sendmail-cf mailx
 package: make git
-package: glibc glibc-common 
+package: glibc glibc-common
 package: bzip2 gzip
 package: cpio tar
-package: coreutils 
-package: rpm rpm-build rpm-devel 
-package: redhat-rpm-config 
-package: curl curl-devel 
-package: subversion cvs 
-package: less 
+package: coreutils
+package: rpm rpm-build rpm-devel
+package: redhat-rpm-config
+package: curl curl-devel
+package: subversion cvs
+package: less
 package: openssh
 package: emacs-nox
-# undetermined 
-package: expect 
-package: gd 
-package: httpd mod_ssl 
-package: openssl 
+# undetermined
+package: expect
+package: gd
+package: httpd mod_ssl
+package: openssl
 package: openssl-devel
 package: zlib
 package: zlib-devel
 package: bison flex
-package: libtool 
-package<=f21: metadata 
-package: mysql mysql-devel mysql-server 
-package: python python-devel 
-package: doxygen  
+package: libtool
+package<=f21: metadata
+package: mysql mysql-devel mysql-server
+package<=f27: python python-devel
+package>=f29: python2 python-unversioned-command python2-devel
+package: python3 python3-devel
+package: doxygen
 package: cronie
-package: xmlsec1 xmlsec1-openssl 
+package: xmlsec1 xmlsec1-openssl
 package: expat-devel
-package: db4-devel 
-package: ncurses-devel 
-package: readline-devel 
-package: dnsmasq 
+package: ncurses-devel
+package: readline-devel
+package: dnsmasq
+package <= f31: db4-devel
 # for spec2make / rpmlib
 package=f8: popt-devel
 # kernel
-package: gnupg 
-package: diffutils 
-package: patchutils 
-package: vconfig 
-package: iptables 
-package: wget 
-package: beecrypt-devel 
+# see myplc/plc.d/gpg
+package<=f29: gnupg
+package>=f31: gnupg1
+package: diffutils
+package: patchutils
+package: vconfig
+package: iptables
+package: wget
+package: beecrypt-devel
 package: tetex-latex
-package: gcc-c++ 
+package: gcc-c++
 package: binutils-devel
+package>=f27: elfutils-libelf-devel
 # required for perf
 package: xmlto asciidoc newt-devel
 package: perl-ExtUtils-Embed
 # iptables
-package: linuxdoc-tools 
-package: sudo 
-package: yum createrepo 
+package: linuxdoc-tools
+package: sudo
+package: yum createrepo
 ## mysql
-#package: gperf 
-#package: time 
+#package: gperf
+#package: time
 # bootmanager
-package: sharutils 
+package: sharutils
 # bootcd
-package: nasm 
-package: mkisofs 
-package: dosfstools 
+package: nasm
+package<=f25: mkisofs
+package>=f27: genisoimage
+package: dosfstools
 package: mtools
 package: syslinux
 # myplc
-package: rsync 
+package: rsync
 package: ghostscript
 # myplc-docs
 package: ed
-package: docbook-utils-pdf 
+package: docbook-utils-pdf
 # plcapi
-package: postgresql postgresql-devel postgresql-python postgresql-server 
+package: postgresql postgresql-devel postgresql-python postgresql-server
 # if we don't specify @arch@ for php-devel, we end up with the 2 variants (i386 and x86_64)
 # in an undetermined order, and php-config --extension-dir might return the wrong place
-package: php php-devel.@arch@ php-gd php-pgsql 
+package: php php-devel.@arch@ php-gd php-pgsql
 # now this seems to have been fixed in f12
 package>=f12: php-devel
-package<=f18: PyXML 
+package<=f18: PyXML
 # used to reference SOAPpy as well
 # for pypcilib
 package: pciutils-devel
@@ -90,7 +96,7 @@ package: python-simplejson
 # for vsys - same as for php-devel above
 package: ocaml.@arch@
 # use local inotify-tools on centos
-package>=f8:inotify-tools-devel 
+package>=f8:inotify-tools-devel
 ### ##########
 ### ## for util-vserver-pl
 ### # use local libnl on centos
@@ -111,14 +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: 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
 # DistributedRateLimiting
 package: libxml2-devel
 # myplc-docs
@@ -132,3 +143,6 @@ package: libgcrypt-devel
 package: libtasn1-devel
 package: nmap-ncat
 package: pkgconfig
+# f29; and needed on f27 so the spawned container actually starts its networking
+package>=f27: NetworkManager
+package>=f29: hostname