Merge branch 'lxc_devel' of ssh://git.planet-lab.org/git/build into lxc_devel

diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs
index c6021e3..b7e21e2 100644 (file)
--- a/config.planetlab/bootstrapfs.pkgs
+++ b/config.planetlab/bootstrapfs.pkgs
@@ -105,7 +105,7 @@ package>=f10: cronie
 #
 # planetlab
 #
-package: madwifi
+#package: madwifi
 package: wireless-tools
 #package: util-vserver
 #package: util-vserver-build

diff --git a/planetlab.mk b/planetlab.mk
index ed57acc..9356c96 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -36,9 +36,9 @@ kernel-SPEC := kernel-3.1.spec
 kernel-DEVEL-RPMS += gettext elfutils-devel
 kernel-BUILD-FROM-SRPM := yes
 ifeq "$(HOSTARCH)" "i386"
-kernel-RPMFLAGS:= --target i686
+kernel-RPMFLAGS:= --target i686 --with firmware
 else
-kernel-RPMFLAGS:= --target $(HOSTARCH)
+kernel-RPMFLAGS:= --target $(HOSTARCH) --with firmware
 endif
 kernel-SPECVARS += kernelconfig=planetlab
 KERNELS += kernel
@@ -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