X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lxc.mk;h=67d607df5125b1a3099d9038e9034879b71c99c3;hb=c10dd89d76d280fc7ee09b4ba384acf6883c08cf;hp=d2c894df73dec7c17cbacad16d8353f97ab0f548;hpb=688f620cb6acd64e2d7e85df5ea1a1261146a190;p=build.git

diff --git a/lxc.mk b/lxc.mk
index d2c894df..67d607df 100644
--- a/lxc.mk
+++ b/lxc.mk
@@ -38,8 +38,6 @@ IN_NODEIMAGE += procprotect
 #
 # ipfw: root context module, and slice companion
 #
-# this module won't build yet under f20
-ifeq "$(DISTRONAME)" "f18"
 ipfwroot-MODULES := ipfw
 ipfwroot-SPEC := planetlab/ipfwroot.spec
 ALL += ipfwroot
@@ -48,7 +46,6 @@ IN_NODEIMAGE += ipfwroot
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
 ALL += ipfwslice
-endif
 
 #
 # comgt - a companion to umts tools
@@ -101,15 +98,10 @@ IN_NODEIMAGE += plnode-utils
 #
 # nodemanager
 #
-nodemanager-lib-MODULES := nodemanager
-nodemanager-lib-SPEC := nodemanager-lib.spec
-ALL += nodemanager-lib
-IN_NODEIMAGE += nodemanager-lib
-
-nodemanager-lxc-MODULES := nodemanager
-nodemanager-lxc-SPEC := nodemanager-lxc.spec
-ALL += nodemanager-lxc
-IN_NODEIMAGE += nodemanager-lxc
+nodemanager-MODULES := nodemanager
+nodemanager-SPEC := nodemanager.spec
+ALL += nodemanager
+IN_NODEIMAGE += nodemanager
 
 #
 # pl_sshd
@@ -151,7 +143,7 @@ libvirt-MODULES := libvirt
 libvirt-SPEC    := libvirt.spec
 libvirt-BUILD-FROM-SRPM := yes
 # The --without options are breaking spec2make : hard-wired in the specfile instead
-libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds gettext gettext-devel libtasn1-devel gnutls-devel 
+libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds
 libvirt-STOCK-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel 
 libvirt-STOCK-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel 
 libvirt-STOCK-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub 
@@ -159,7 +151,7 @@ libvirt-STOCK-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub
 libvirt-STOCK-DEVEL-RPMS += libblkid-devel glusterfs-api-devel glusterfs-devel
 # strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
 libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad 
-libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel netcf-devel
+libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel
 ALL += libvirt
 IN_NODEREPO += libvirt
 IN_NODEIMAGE += libvirt
@@ -174,7 +166,7 @@ ifeq "$(separate_libvirt_python)" "true"
 libvirt-python-MODULES := libvirt-python
 libvirt-python-SPEC    := libvirt-python.spec
 libvirt-python-BUILD-FROM-SRPM := yes
-libvirt-python-STOCK-DEVEL-RPMS += gnutls-utils nc pm-utils 
+libvirt-python-STOCK-DEVEL-RPMS += pm-utils
 libvirt-python-LOCAL-DEVEL-RPMS += libvirt-devel libvirt-docs libvirt-client
 libvirt-python-RPMFLAGS :=     --define 'packager PlanetLab'
 ALL += libvirt-python
@@ -244,6 +236,11 @@ vsys-scripts-SPEC := root-context/vsys-scripts.spec
 IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 
+vsys-wrapper-MODULES := vsys-scripts
+vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
+IN_SLICEIMAGE += vsys-wrapper
+ALL += vsys-wrapper
+
 #
 # bind_public
 #
@@ -369,18 +366,6 @@ IN_NODEIMAGE += pyplnet
 IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
-#
-# for OMF resource controller as a gem : rvm-ruby has right version of ruby and related gem stuff
-#
-ifneq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
-rvm-ruby-MODULES := rvm-ruby
-rvm-ruby-SPEC := rpm/rvm-ruby.spec
-rvm-ruby-STOCK-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel
-# Since Oct 22. 2013, f18 has a new release of openssl that ruby is not too happy to build against
-# turning this off for now, Christoph Dwertmann to monitor the status of this bug/incompatibility upstream
-ALL += rvm-ruby
-endif
-
 #
 # OML measurement library
 #