would break the build

[build.git] / onelab.mk

diff --git a/onelab.mk b/onelab.mk
index ebe6ae8..a3fdaa9 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -65,6 +65,32 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
+#
+# mac80211
+#
+mac80211-MODULES := mac80211
+mac80211-SPEC := mac80211.spec
+mac80211-BUILD-FROM-SRPM := yes
+mac80211-DEPEND-DEVEL-RPMS := kernel-devel
+mac80211-SPECVARS = kernel_version=$(kernel.rpm-version) \
+       kernel_release=$(kernel.rpm-release) \
+       kernel_arch=$(kernel.rpm-arch)
+#ALL += mac80211
+#IN_BOOTSTRAPFS += mac80211
+
+#
+# iwlwifi
+#
+iwlwifi-MODULES := iwlwifi
+iwlwifi-SPEC := iwlwifi.spec
+iwlwifi-BUILD-FROM-SRPM := yes
+iwlwifi-DEPEND-DEVEL-RPMS := kernel-devel mac80211-devel
+iwlwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
+       kernel_release=$(kernel.rpm-release) \
+       kernel_arch=$(kernel.rpm-arch)
+#ALL += iwlwifi
+#IN_BOOTSTRAPFS += iwlwifi
+
 #
 # wireless-tools
 # 
@@ -84,8 +110,8 @@ nozomi-DEPEND-DEVEL-RPMS := kernel-devel
 nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \
        kernel_release=$(kernel.rpm-release) \
        kernel_arch=$(kernel.rpm-arch)
-#IN_BOOTSTRAPFS += nozomi
-#ALL += nozomi
+IN_BOOTSTRAPFS += nozomi
+ALL += nozomi
 
 #
 # comgt
@@ -305,7 +331,7 @@ vserver-RPMBUILD := sudo bash ./rpmbuild.sh
 vserver-DEPEND-PACKAGES := $(IN_VSERVER)
 vserver-DEPEND-FILES := RPMS/yumgroups.xml
 ALL += vserver
-IN_BOOTSTRAPFS := vserver
+IN_BOOTSTRAPFS += vserver
 
 #
 # bootstrapfs