X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=onelab.mk;h=4d0ffa0e8cf47c00cc6baabd05e8f12f0e0f624d;hb=e363088bd9d90c05e00423821228c98793cae036;hp=43ee0cc098001b040777995e1271d791822e73a4;hpb=ccf3cf881ed193791089afb55c166c7219de79a8;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 43ee0cc0..4d0ffa0e 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -25,6 +25,7 @@ kernel-RPMFLAGS:= --target i686
 else
 kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
+# this is useful for 2.6.22 but will not be needed anymore with 2.6.27
 kernel-SPECVARS := iwlwifi=1
 KERNELS += kernel
 
@@ -72,6 +73,22 @@ comgt-SPEC := comgt.spec
 IN_BOOTSTRAPFS += comgt
 ALL += comgt
 
+#
+# umts: root context stuff
+#
+umts-backend-MODULES := planetlab-umts-tools
+umts-backend-SPEC := backend.spec
+IN_BOOTSTRAPFS += umts-backend
+ALL += umts-backend
+
+#
+# umts: slice tools
+#
+umts-frontend-MODULES := planetlab-umts-tools
+umts-frontend-SPEC := frontend.spec
+IN_VSERVER += umts-frontend
+ALL += umts-frontend
+
 #
 # util-vserver
 #
@@ -95,6 +112,8 @@ ifeq "$(local_libnl)" "true"
 libnl-MODULES := libnl
 libnl-SPEC := libnl.spec
 libnl-BUILD-FROM-SRPM := yes
+# this sounds like the thing to do, but in fact linux/if_vlan.h comes with kernel-headers
+libnl-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
 ALL += libnl
 IN_BOOTSTRAPFS += libnl
 endif
@@ -180,7 +199,7 @@ IN_BOOTSTRAPFS += mom
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-iptables-DEPEND-DEVEL-RPMS := kernel-devel
+iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
 
@@ -222,6 +241,14 @@ endif
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
 
+#
+# vsys-scripts
+#
+vsys-scripts-MODULES := vsys-scripts
+vsys-scripts-SPEC := vsys-scripts.spec
+IN_BOOTSTRAPFS += vsys-scripts
+ALL += vsys-scripts
+
 #
 # dummynet_image
 # 
@@ -239,12 +266,29 @@ ALL += PLCAPI
 IN_MYPLC += PLCAPI
 
 #
-# PLCWWW
+# drupal
+# 
+drupal-MODULES := drupal
+drupal-SPEC := drupal.spec
+drupal-BUILD-FROM-SRPM := yes
+ALL += drupal
+IN_MYPLC += drupal
+
+#
+# use the plewww module instead
+#
+plewww-MODULES := PLEWWW
+plewww-SPEC := plewww.spec
+ALL += plewww
+IN_MYPLC += plewww
+
+#
+# www-register-wizard
 #
-PLCWWW-MODULES := PLCWWW
-PLCWWW-SPEC := PLCWWW.spec
-ALL += PLCWWW
-IN_MYPLC += PLCWWW
+www-register-wizard-MODULES := www-register-wizard
+www-register-wizard-SPEC := www-register-wizard.spec
+ALL += www-register-wizard
+IN_MYPLC += www-register-wizard
 
 #
 # monitor
@@ -255,11 +299,12 @@ ALL += monitor
 IN_BOOTSTRAPFS += monitor
 
 #
-# monitor-server
+# zabbix
 #
-monitor-server-MODULES := Monitor
-monitor-server-SPEC := monitor-server.spec
-ALL += monitor-server
+zabbix-MODULES := Monitor
+zabbix-SPEC := zabbix.spec
+zabbix-BUILD-FROM-SRPM := yes
+ALL += zabbix
 
 #
 # nodeconfig
@@ -285,6 +330,16 @@ pypcilib-SPEC := pypcilib.spec
 ALL += pypcilib
 IN_BOOTCD += pypcilib
 
+#
+# pyplnet
+#
+pyplnet-MODULES := pyplnet
+pyplnet-SPEC := pyplnet.spec
+ALL += pyplnet
+IN_BOOTSTRAPFS += pyplnet
+IN_MYPLC += pyplnet
+IN_BOOTCD += pyplnet
+
 #
 # bootcd
 #
@@ -302,8 +357,6 @@ IN_MYPLC += bootcd
 #
 vserver-MODULES := VserverReference build
 vserver-SPEC := vserver-reference.spec
-# Package must be built as root
-vserver-RPMBUILD := sudo bash ./rpmbuild.sh
 vserver-DEPEND-PACKAGES := $(IN_VSERVER)
 vserver-DEPEND-FILES := RPMS/yumgroups.xml
 vserver-RPMDATE := yes
@@ -344,27 +397,12 @@ ALL += noderepo
 IN_MYPLC += noderepo
 
 #
-# MyPLC native : lightweight packaging, dependencies are yum-installed in a vserver
-#
-myplc-native-MODULES := MyPLC build 
-myplc-native-SPEC := myplc-native.spec
-# Package must be built as root
-myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh
-myplc-native-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
-ALL += myplc-native
-
-## #
-## # myplc : old-fashioned, chroot-based packaging
-## #
-## myplc-MODULES := MyPLC build
-## myplc-SPEC := myplc.spec
-## # Package must be built as root
-## myplc-RPMBUILD := sudo bash ./rpmbuild.sh
-## # myplc may require all packages
-## myplc-DEPEND-PACKAGES := $(IN_MYPLC)
-## myplc-DEPEND-FILES := RPMS/yumgroups.xml myplc-release
-## myplc-RPMDATE := yes
-## ALL += myplc
+# MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
+#
+myplc-MODULES := MyPLC build 
+myplc-SPEC := myplc.spec
+myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
+ALL += myplc
 
 # myplc-docs only contains docs for PLCAPI and NMAPI, but
 # we still need to pull MyPLC, as it is where the specfile lies, 
@@ -373,7 +411,8 @@ myplc-docs-MODULES := MyPLC PLCAPI NodeManager
 myplc-docs-SPEC := myplc-docs.spec
 ALL += myplc-docs
 
-myplc-release-MODULES := MyPLC
-myplc-release-SPEC := myplc-release.spec
-myplc-release-RPMDATE := yes
-ALL += myplc-release
+# using some other name than myplc-release, as this is a make target already
+release-MODULES := MyPLC
+release-SPEC := myplc-release.spec
+release-RPMDATE := yes
+ALL += release