set up ssh in debian boxes

[build.git] / lxc.mk

diff --git a/lxc.mk b/lxc.mk
index 51fcc76..1749d4f 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -38,8 +38,8 @@ IN_NODEIMAGE += procprotect
 #
 # ipfw: root context module, and slice companion
 #
-# starting on 2013-03-05 when f18 has moved to kernel 3.8 this module won't build anymore
-#ifeq "$(DISTRONAME)" "f16"
+# this module won't build yet under f20
+ifeq "$(DISTRONAME)" "f18"
 ipfwroot-MODULES := ipfw
 ipfwroot-SPEC := planetlab/ipfwroot.spec
 ALL += ipfwroot
@@ -48,7 +48,7 @@ IN_NODEIMAGE += ipfwroot
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
 ALL += ipfwslice
-#endif
+endif
 
 #
 # comgt - a companion to umts tools
@@ -135,11 +135,11 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_NODEIMAGE += fprobe-ulog
 
-#################### using our own libvirt on all distros for now
-#local_libvirt=false
-#ifeq "$(DISTRONAME)" "f16"
+#################### using our own libvirt on f18, and the stock version later on
+local_libvirt=false
+ifeq "$(DISTRONAME)" "f18"
 local_libvirt=true
-#endif
+endif
 
 ifeq "$(local_libvirt)" "true"
 #
@@ -157,9 +157,9 @@ ifeq "$(DISTRONAME)" "f16"
 libvirt-STOCK-DEVEL-RPMS += libnl-devel libudev-devel
 endif
 # strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
-ifeq "$(DISTRONAME)" "f18"
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f18 f20)"
 libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad 
-libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 
+libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel
 endif
 libvirt-RPMFLAGS :=    --define 'packager PlanetLab'
 ALL += libvirt
@@ -376,7 +376,9 @@ IN_BOOTCD += pyplnet
 rvm-ruby-MODULES := rvm-ruby
 rvm-ruby-SPEC := rpm/rvm-ruby.spec
 rvm-ruby-STOCK-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel
-ALL += rvm-ruby
+# 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
 
 #
 # OML measurement library
@@ -503,9 +505,9 @@ sfa-MODULES := sfa
 sfa-SPEC := sfa.spec
 ALL += sfa
 
-sface-MODULES := sface
-sface-SPEC := sface.spec
-ALL += sface
+#sface-MODULES := sface
+#sface-SPEC := sface.spec
+#ALL += sface
 endif
 
 ##############################