another devel rpm required at build time for libvirt when using enable_autotools

[build.git] / lxc.mk

diff --git a/lxc.mk b/lxc.mk
index f54ae75..940ad65 100644 (file)
--- a/lxc.mk
+++ b/lxc.mk
@@ -8,6 +8,25 @@
 # see doc in Makefile  
 #
 
+### the madwifi drivers ahip with fedora16's kernel rpm
+
+#
+# lxctools: scripts for entering containers
+#
+lxctools-MODULES := lxctools
+lxctools-SPEC := lxctools.spec
+ALL += lxctools
+IN_NODEIMAGE += lxctools
+
+#
+# lxcsu: root context module for entering namespaces
+#
+lxcsu-MODULES := lxcsu
+lxcsu-SPEC := lxcsu.spec
+ALL += lxcsu
+IN_NODEIMAGE += lxcsu
+
+#
 #
 # transforward: root context module for transparent port forwarding
 #
@@ -34,9 +53,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 +71,14 @@ ipod-SPEC := ipod.spec
 ALL += ipod
 IN_NODEIMAGE += ipod
 
+#
+# plnode-utils
+# 
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils-lxc.spec
+ALL += plnode-utils
+IN_NODEIMAGE += plnode-utils
+
 #
 # nodemanager
 #
@@ -92,26 +116,36 @@ 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"
+local_libvirt=true
+#endif
+
+ifeq "$(local_libvirt)" "true"
 #
 # libvirt
 #
 libvirt-MODULES := libvirt
 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 += 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 \
-                       --without libxl \
-                       --define 'packager PlanetLab'
+# The --without options are breaking spec2make : hard-wired in the specfile instead
+libvirt-DEVEL-RPMS += xhtml1-dtds gettext gettext-devel libtasn1-devel gnutls-devel 
+libvirt-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel 
+libvirt-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel 
+libvirt-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub 
+ifeq "$(DISTRONAME)" "f16"
+libvirt-DEVEL-RPMS += libnl-devel libudev-devel
+endif
+ifeq "$(DISTRONAME)" "f18"
+libvirt-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad 
+libvirt-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 
+endif
+libvirt-RPMFLAGS :=    --define 'packager PlanetLab'
 ALL += libvirt
 IN_NODEREPO += libvirt
 IN_NODEIMAGE += libvirt
+endif
 
 #
 # DistributedRateLimiting
@@ -131,7 +165,7 @@ ALL += pf2slice
 ##
 ## PlanetLab Mom: Cleans up your mess
 ##
-#mom-MODULES := Mom
+#mom-MODULES := mom
 #mom-SPEC := pl_mom.spec
 #ALL += mom
 #IN_NODEIMAGE += mom
@@ -194,15 +228,23 @@ ALL += vsyssh
 # vsys-scripts
 #
 vsys-scripts-MODULES := vsys-scripts
-vsys-scripts-SPEC := vsys-scripts.spec
+vsys-scripts-SPEC := root-context/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
 #
 plcapi-MODULES := plcapi
-plcapi-SPEC := PLCAPI.spec
+plcapi-SPEC := plcapi.spec
 ALL += plcapi
 IN_MYPLC += plcapi