#
# 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$
#
#
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)
+ifeq "$(HOSTARCH)" "i386"
kernel-RPMFLAGS:= --target i686
else
kernel-RPMFLAGS:= --target $(HOSTARCH)
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
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
#
vsys-MODULES := vsys
vsys-SPEC := vsys.spec
-ifeq ($(DISTRO),"Fedora")
-ifeq ($(RELEASE),7)
+IN_BOOTSTRAPFS += vsys
+ifeq "$(DISTRO)" "Fedora"
+ifeq "$(RELEASE)" "7"
ALL += vsys
endif
-ifeq ($(RELEASE),8)
+ifeq "$(RELEASE)" "8"
ALL += vsys
endif
endif
#
# PLCWWW
#
-PLCWWW-MODULES := WWW
+PLCWWW-MODULES := PLCWWW
PLCWWW-SPEC := PLCWWW.spec
ALL += PLCWWW
IN_MYPLC += PLCWWW
#
# bootmanager
#
-bootmanager-MODULES := BootManager build
+bootmanager-MODULES := BootManager
bootmanager-SPEC := bootmanager.spec
-# Package must be built as root
-bootmanager-RPMBUILD := sudo bash ./rpmbuild.sh
ALL += bootmanager
IN_MYPLC += bootmanager
vserver-DEPEND-PACKAGES := $(IN_VSERVER)
vserver-DEPEND-FILES := RPMS/yumgroups.xml
ALL += vserver
-IN_BOOTSTRAPFS := vserver
+IN_BOOTSTRAPFS += vserver
#
# bootstrapfs