Merge branch 'lxc' into lxc_devel

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index 1052a23..7bfb32f 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -70,6 +70,14 @@ endif
 #endif
 #endif
 
+
+# bootcd-systemd
+#
+bootcd-systemd-MODULES := bootcd-systemd
+bootcd-systemd-SPEC := bootcd-systemd.spec
+ALL += bootcd-systemd
+IN_BOOTCD += bootcd-systemd
+
 #
 # iptables
 #
@@ -197,8 +205,8 @@ libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without sto
                        --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'
+                       --without libxl \
+                       --define 'packager PlanetLab'
 ALL += libvirt
 IN_NODEREPO += libvirt
 IN_BOOTSTRAPFS += libvirt
@@ -206,10 +214,10 @@ IN_BOOTSTRAPFS += libvirt
 #
 # DistributedRateLimiting
 #
-DistributedRateLimiting-MODULES := DistributedRateLimiting
-DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
-ALL += DistributedRateLimiting
-IN_NODEREPO += DistributedRateLimiting
+#DistributedRateLimiting-MODULES := DistributedRateLimiting
+#DistributedRateLimiting-SPEC := DistributedRateLimiting.spec
+#ALL += DistributedRateLimiting
+#IN_NODEREPO += DistributedRateLimiting
 
 #
 # pf2slice
@@ -252,9 +260,9 @@ endif
 #
 openvswitch-MODULES := openvswitch
 openvswitch-SPEC := openvswitch.spec
-openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
-#IN_BOOTSTRAPFS += openvswitch
-#ALL += openvswitch
+openvswitch-DEVEL-RPMS += kernel-devel
+IN_BOOTSTRAPFS += openvswitch
+ALL += openvswitch
 
 #
 # vsys
@@ -328,11 +336,11 @@ ALL += pcucontrol
 #
 # monitor
 #
-monitor-MODULES := monitor
-monitor-SPEC := Monitor.spec
-monitor-DEVEL-RPMS += net-snmp net-snmp-devel
-ALL += monitor
-IN_BOOTSTRAPFS += monitor
+#monitor-MODULES := monitor
+#monitor-SPEC := Monitor.spec
+#monitor-DEVEL-RPMS += net-snmp net-snmp-devel
+#ALL += monitor
+#IN_BOOTSTRAPFS += monitor
 
 #
 # PLC RT