use tagged tests together with tagged sfa

[build.git] / lxc.mk

diff --git a/lxc.mk b/lxc.mk
index f54ae75..f2231a4 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -34,9 +34,6 @@ IN_NODEIMAGE += ipfwroot
 
 ipfwslice-MODULES := ipfw
 ipfwslice-SPEC := planetlab/ipfwslice.spec
-ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
-        kernel_release=$(kernel.rpm-release) \
-        kernel_arch=$(kernel.rpm-arch)
 ALL += ipfwslice
 
 #
@@ -55,6 +52,14 @@ ipod-SPEC := ipod.spec
 ALL += ipod
 IN_NODEIMAGE += ipod
 
+#
+# plnode_utils
+# 
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils.spec
+ALL += plnode-utils
+IN_NODEIMAGE += plnode-utils
+
 #
 # nodemanager
 #
@@ -92,6 +97,13 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_NODEIMAGE += fprobe-ulog
 
+#################### libvirt on f16 is too old, sounds like f17 has something fine
+local_libvirt=false
+ifeq "$(DISTRONAME)" "f16"
+local_libvirt=true
+endif
+
+ifeq "$(local_libvirt)" "true"
 #
 # libvirt
 #
@@ -101,7 +113,7 @@ 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 += libudev-devel
+libvirt-DEVEL-RPMS += libudev-devel libpcap-devel libnl-devel ebtables scrub
 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 \
@@ -112,6 +124,7 @@ libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without sto
 ALL += libvirt
 IN_NODEREPO += libvirt
 IN_NODEIMAGE += libvirt
+endif
 
 #
 # DistributedRateLimiting
@@ -198,6 +211,14 @@ vsys-scripts-SPEC := vsys-scripts.spec
 IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 
+#
+# bind_public
+#
+bind_public-MODULES := bind_public
+bind_public-SPEC := bind_public.spec
+IN_SLICEIMAGE += bind_public
+ALL += bind_public
+
 #
 # plcapi
 #