renaming WWW module into PLCWWW

[build.git] / planetlab.mk

diff --git a/planetlab.mk b/planetlab.mk
index 016b7b1..169cff9 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -1,8 +1,9 @@
 #
 # PlanetLab standard components list
-#
+# initial version from Mark Huang
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2003-2006 The Trustees of Princeton University
+# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
 #
 # $Id$
 #
@@ -17,7 +18,7 @@
 #
 
 kernel-MODULES := linux-patches
-kernel-SPEC := kernel-2.6-planetlab.spec
+kernel-SPEC := kernel-2.6.spec
 kernel-BUILD-FROM-SRPM := yes
 ifeq "$(HOSTARCH)" "i386"
 kernel-RPMFLAGS:= --target i686
@@ -38,9 +39,21 @@ IN_BOOTSTRAPFS += $(KERNELS)
 IN_MYPLC += $(KERNELS)
 
 #
-# madwifi
+# kexec-tools
+#
+ifeq "$(DISTRO)" "Fedora"
+ifeq "$(RELEASE)" "4"
+kexec-tools-MODULES := kexec-tools
+kexec-tools-SPEC := kexec-tools.spec
+kexec-tools-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
+kexec-tools-TAG := planetlab-4_1-rc2
+ALL += kexec-tools
+IN_BOOTCD += kexec-tools
+endif
+endif
+
 #
-# [thierry] - temporarily use onelab's svn
+# madwifi
 #
 madwifi-MODULES := madwifi
 madwifi-SPEC := madwifi.spec
@@ -49,8 +62,8 @@ madwifi-DEPEND-DEVEL-RPMS := kernel-devel
 madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
        kernel_release=$(kernel.rpm-release) \
        kernel_arch=$(kernel.rpm-arch)
-IN_BOOTSTRAPFS += madwifi
 ALL += madwifi
+IN_BOOTSTRAPFS += madwifi
 
 #
 # wireless-tools
@@ -61,22 +74,6 @@ wireless-tools-BUILD-FROM-SRPM := yes
 ALL += wireless-tools
 IN_BOOTSTRAPFS += wireless-tools
 
-#################### tmp
-ifeq "$(DISTRO)" "Fedora"
-ifeq "$(RELEASE)" "4"
-#
-# kexec-tools
-#
-kexec-tools-MODULES := kexec-tools
-kexec-tools-SPEC := kexec-tools.spec
-kexec-tools-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
-kexec-tools-TAG := planetlab-4_1-rc2
-ALL += kexec-tools
-IN_BOOTCD += kexec-tools
-endif
-endif
-#################### tmp
-
 #
 # libnl
 #
@@ -222,6 +219,7 @@ IN_BOOTSTRAPFS += iproute
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
+IN_BOOTSTRAPFS += vsys
 ifeq "$(DISTRO)" "Fedora"
 ifeq "$(RELEASE)" "7"
 ALL += vsys
@@ -242,7 +240,7 @@ IN_MYPLC += PLCAPI
 #
 # PLCWWW
 #
-PLCWWW-MODULES := WWW
+PLCWWW-MODULES := PLCWWW
 PLCWWW-SPEC := PLCWWW.spec
 ALL += PLCWWW
 IN_MYPLC += PLCWWW
@@ -287,7 +285,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