Build firmware

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index 290e373..9356c96 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -32,13 +32,13 @@ endif
 #
 
 kernel-MODULES := linux-3
+kernel-SPEC := kernel-3.1.spec
 kernel-DEVEL-RPMS += gettext elfutils-devel
-kernel-SPEC := kernel.spec
 kernel-BUILD-FROM-SRPM := yes
 ifeq "$(HOSTARCH)" "i386"
-kernel-RPMFLAGS:= --target i686 --without tools --without debug --without debuginfo
+kernel-RPMFLAGS:= --target i686 --with firmware
 else
-kernel-RPMFLAGS:= --target $(HOSTARCH) --without tools --without debug --without debuginfo
+kernel-RPMFLAGS:= --target $(HOSTARCH) --with firmware
 endif
 kernel-SPECVARS += kernelconfig=planetlab
 KERNELS += kernel
@@ -56,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
@@ -251,8 +251,8 @@ endif
 openvswitch-MODULES := openvswitch
 openvswitch-SPEC := openvswitch.spec
 openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
-IN_BOOTSTRAPFS += openvswitch
-ALL += openvswitch
+#IN_BOOTSTRAPFS += openvswitch
+#ALL += openvswitch
 
 #
 # vsys