Update master branch of myplc.

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index 3fe385c..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
 #
@@ -190,13 +198,15 @@ libvirt-SPEC    := libvirt.spec
 libvirt-BUILD-FROM-SRPM := yes
 libvirt-DEVEL-RPMS += libxml2-devel gnutls-devel device-mapper-devel yajl-devel gettext 
 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 += xhtml1-dtds libxslt libtasn1-devel systemtap-sdt-devel iptables-ipv6 augeas 
+libvirt-DEVEL-RPMS += libudev-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 \
-                    --define 'packager PlanetLab'
+                       --without libxl \
+                       --define 'packager PlanetLab'
 ALL += libvirt
 IN_NODEREPO += libvirt
 IN_BOOTSTRAPFS += libvirt
@@ -204,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
@@ -250,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
@@ -326,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