cosmetic

[build.git] / onelab.mk

diff --git a/onelab.mk b/onelab.mk
index 659756d..69b4991 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -65,6 +65,19 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
+#
+# 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
 # 
@@ -319,23 +332,6 @@ bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
 ALL += bootstrapfs
 IN_MYPLC += bootstrapfs
 
-#
-# noderepo
-#
-NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms))
-noderepo.list:
-       @for rpm in $(NODEREPO_RPMS) ; do echo $rpm ; done > $@
-
-noderepo-MODULES := BootstrapFS build
-noderepo-SPEC := noderepo.spec
-noderepo-RPMBUILD := sudo bash ./rpmbuild.sh
-# package requires all regular packages
-noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
-noderepo-DEPEND-FILES := RPMS/yumgroups.xml noderepo.list
-# not yet
-#ALL += noderepo
-#IN_MYPLC += noderepo
-
 #
 # myplc : initial, chroot-based packaging
 #