From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 18 Jan 2013 07:44:40 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/build
X-Git-Tag: 5.2.1~122
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e1e312e79829c870fc9f79f832170f848a508494;hp=901a464e863db5a992841f84217c89a373b3c0c2;p=build.git

Merge branch 'master' of ssh://git.onelab.eu/git/build
---

diff --git a/config.mlab/nodeimage.pkgs b/config.mlab/nodeimage.pkgs
index 5b8ef7c9..28ff0369 100644
--- a/config.mlab/nodeimage.pkgs
+++ b/config.mlab/nodeimage.pkgs
@@ -32,7 +32,7 @@ package: rootfiles
 package: rpm
 package: setserial
 package: setup
-package: vim-minimal
+package: vim-enhanced
 package: shadow-utils
 package>=centos5: anacron
 package<=f10: anacron
@@ -126,3 +126,4 @@ package: vsys-scripts
 package: monitor-client
 package: monitor-runlevelagent
 package: pyplnet
+package: plnode-utils
diff --git a/config.mlab/sliceimage.pkgs b/config.mlab/sliceimage.pkgs
index 58b19623..574dffed 100644
--- a/config.mlab/sliceimage.pkgs
+++ b/config.mlab/sliceimage.pkgs
@@ -32,6 +32,7 @@ package: python-devel
 package: tar
 package: findutils
 package: filesystem
+package: vim-enhanced
 
 package<=f8 package=centos5: vixie-cron
 package>=f10: cronie
diff --git a/lxc.mk b/lxc.mk
index 14a2d60c..6bb9ba30 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -133,13 +133,14 @@ libvirt-DEVEL-RPMS += libxml2-devel gnutls-devel device-mapper-devel yajl-devel
 libvirt-DEVEL-RPMS += python-devel libcap-ng-devel libpciaccess-devel radvd numactl-devel 
 libvirt-DEVEL-RPMS += xhtml1-dtds libxslt libtasn1-devel systemtap-sdt-devel iptables-ipv6 augeas 
 libvirt-DEVEL-RPMS += libudev-devel libpcap-devel libnl-devel ebtables scrub ceph-devel
-libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without storage-scsi \
-	                --without storage-fs --without storage-lvm \
-	                --without polkit --without sasl --without audit --with capng --with udev \
-	                --without netcf --without avahi --without sanlock \
-	                --without xen --without qemu --without hyperv --without phyp --without esx \
-	                --without libxl \
-	                --define 'packager PlanetLab'
+# The --without options are breaking spec2make
+#libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without storage-scsi \
+#	                --without storage-fs --without storage-lvm \
+#	                --without polkit --without sasl --without audit --with capng --with udev \
+#	                --without netcf --without avahi --without sanlock \
+#	                --without xen --without qemu --without hyperv --without phyp --without esx \
+#	                --without libxl \
+libvirt-RPMFLAGS :=	--define 'packager PlanetLab'
 ALL += libvirt
 IN_NODEREPO += libvirt
 IN_NODEIMAGE += libvirt