Disable madwifi from build

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index f58cd56..ed57acc 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -31,8 +31,9 @@ endif
 # so the source rpm is created by running make srpm in the codebase
 #
 
-kernel-MODULES := linux-2.6
-kernel-SPEC := kernel-2.6.spec
+kernel-MODULES := linux-3
+kernel-SPEC := kernel-3.1.spec
+kernel-DEVEL-RPMS += gettext elfutils-devel
 kernel-BUILD-FROM-SRPM := yes
 ifeq "$(HOSTARCH)" "i386"
 kernel-RPMFLAGS:= --target i686
@@ -55,19 +56,19 @@ IN_BOOTSTRAPFS += $(KERNELS)
 # madwifi
 #
 # skip this with k32/f8
-ifneq "" "$(findstring k32,$(PLDISTROTAGS))"
-ifneq "$(DISTRONAME)" "f8"
-madwifi-MODULES := madwifi
-madwifi-SPEC := madwifi.spec
-madwifi-BUILD-FROM-SRPM := yes
-madwifi-DEPEND-DEVEL-RPMS += kernel-devel
-madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
-       kernel_release=$(kernel.rpm-release) \
-       kernel_arch=$(kernel.rpm-arch)
-ALL += madwifi
-IN_BOOTSTRAPFS += madwifi
-endif
-endif
+#ifneq "" "$(findstring k32,$(PLDISTROTAGS))"
+#ifneq "$(DISTRONAME)" "f8"
+#madwifi-MODULES := madwifi
+#madwifi-SPEC := madwifi.spec
+#madwifi-BUILD-FROM-SRPM := yes
+#madwifi-DEPEND-DEVEL-RPMS += kernel-devel
+#madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
+#    kernel_release=$(kernel.rpm-release) \
+#    kernel_arch=$(kernel.rpm-arch)
+#ALL += madwifi
+#IN_BOOTSTRAPFS += madwifi
+#endif
+#endif
 
 #
 # iptables
@@ -189,7 +190,7 @@ 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
+libvirt-DEVEL-RPMS += xhtml1-dtds libxslt libtasn1-devel systemtap-sdt-devel iptables-ipv6 augeas
 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 \
@@ -197,6 +198,7 @@ libvirt-RPMFLAGS := --without storage-disk --without storage-iscsi --without sto
                        --without xen --without qemu --without hyperv --without phyp --without esx \
                     --define 'packager PlanetLab'
 ALL += libvirt
+IN_NODEREPO += libvirt
 IN_BOOTSTRAPFS += libvirt
 
 #
@@ -459,6 +461,14 @@ vserver-RPMDATE := yes
 ALL += vserver
 IN_BOOTSTRAPFS += vserver
 
+#
+# LXC reference images
+#
+lxcref-MODULES := lxc-reference
+lxcref-SPEC    := lxc-reference.spec
+ALL += lxcref
+IN_BOOTSTRAPFS += lxcref
+
 #
 # bootstrapfs
 #