more cleanup

[build.git] / onelab.mk

diff --git a/onelab.mk b/onelab.mk
index 7056246..5a6feab 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -69,18 +69,6 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
 
-# 
-# nozomi
-# 
-nozomi-MODULES := nozomi
-nozomi-SPEC := nozomi.spec
-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
-
 #
 # comgt
 # 
@@ -110,6 +98,7 @@ ALL += umts-frontend
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
+iptables-BUILD-FROM-SRPM := yes
 iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
@@ -119,6 +108,7 @@ IN_BOOTSTRAPFS += iptables
 #
 iproute-MODULES := iproute2
 iproute-SPEC := iproute.spec
+iproute-BUILD-FROM-SRPM        := yes  
 ALL += iproute
 IN_BOOTSTRAPFS += iproute
 IN_VSERVER += iproute
@@ -129,6 +119,8 @@ IN_BOOTCD += iproute
 #
 util-vserver-MODULES := util-vserver
 util-vserver-SPEC := util-vserver.spec
+# starting with 0.4
+util-vserver-BUILD-FROM-SRPM := yes
 util-vserver-RPMFLAGS:= --without dietlibc --without doc
 ALL += util-vserver
 IN_BOOTSTRAPFS += util-vserver
@@ -327,7 +319,7 @@ ALL += pcucontrol
 #
 # monitor
 #
-monitor-MODULES := Monitor
+monitor-MODULES := monitor
 monitor-SPEC := Monitor.spec
 monitor-DEVEL-RPMS += net-snmp net-snmp-devel
 ALL += monitor