X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=config.lxc%2Fdevel.pkgs;h=d0259d67ca526507f3a65d15e51d6d4d688c3152;hb=HEAD;hp=2e7bc3841669192ab074969532811a491fad494f;hpb=f6ef12ec55b2d140fb1ebcf68bee49cb61208a15;p=build.git

diff --git a/config.lxc/devel.pkgs b/config.lxc/devel.pkgs
index 2e7bc384..8a72ab14 100644
--- a/config.lxc/devel.pkgs
+++ b/config.lxc/devel.pkgs
@@ -3,95 +3,87 @@ 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_python 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: metadata 
-package: mysql mysql-devel mysql-server 
-package: python python-devel 
-package: doxygen  
-package: vixie-cron 
-package: xmlsec1 xmlsec1-openssl 
-package: udev 
+# package: bison flex
+package: libtool
+# package: mysql mysql-devel mysql-server
+# package: python2 python-unversioned-command python2-devel
+package: python3 python3-devel
+# package: doxygen
+package: cronie
+package: xmlsec1 xmlsec1-openssl
 package: expat-devel
-package: db4-devel 
-package: ncurses-devel 
-package: readline-devel 
-package: dnsmasq 
-# for spec2make / rpmlib
-package=f8: popt-devel
+# package: ncurses-devel
+package: readline-devel
+# package: dnsmasq
 # kernel
-package: gnupg 
-package: diffutils 
-package: patchutils 
-package: vconfig 
-package: iptables 
-package: wget 
-package: beecrypt-devel 
+# see myplc/plc.d/gpg
+package: 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: elfutils-libelf-devel
 # required for perf
-package: xmlto asciidoc newt-devel
+# 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: mtools
-package: syslinux
+# package: nasm
+# package: 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 
-# 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 
-# now this seems to have been fixed in f12
-package>=f12: php-devel
-package: PyXML 
-# used to reference SOAPpy as well
+package: postgresql postgresql-devel postgresql-server
+package: php-devel
 # for pypcilib
-package: pciutils-devel
-package: python-simplejson
+# package: pciutils-devel
+# package: python-simplejson
 ##########
 # for vsys - same as for php-devel above
-package: ocaml.@arch@
+# package: ocaml.@arch@
 # use local inotify-tools on centos
-package>=f8:inotify-tools-devel 
+# package:inotify-tools-devel
 ### ##########
 ### ## for util-vserver-pl
 ### # use local libnl on centos
@@ -105,20 +97,39 @@ package>=f8:inotify-tools-devel
 ##########
 # openvswitch
 # starting with f16 we use the stock kernel, and openvswitch needs kernel-devel
-package>=f16: kernel-devel
+# package: kernel-devel
+# package: kernel-modules-extra
 ##########
 # zabbix/monitor
-package=centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@
+# package=centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@
 ##########
 # for sfa : rebuilding wsdl index at build-time
-package: python-uuid 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
-package>=f18: texlive-ec
+package: texlive-ec
+# libvirt
+# package: gettext
+# package: gettext-devel
+# package: gnutls-devel
+# package: gnutls-utils
+# package: libgcrypt-devel
+# package: libtasn1-devel
+# package: nmap-ncat
+# package: pkgconfig
+# needed so the spawned container actually starts its networking
+package: NetworkManager
+package: hostname