X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=0225479f01943907de28b456806a9ae7c41d6fe2;hb=c4ce32f113567126071bfdbfef46acb9c90af8a1;hp=34be23de2c29107f7c5a1b0c8685c2dc2b618c73;hpb=cd95c69c1a754f8121b0c09eebdab4023b7ef64a;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index 34be23de..0225479f 100644
--- 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,20 +18,17 @@
 #
 
 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)
 endif
 KERNELS += kernel
 
-kernel: $(KERNELS)
-kernel-clean: $(foreach package,$(KERNELS),$(package)-clean)
-
-# the first kernel package defined here for convenience
-kernel_package := $(word 1,$(KERNELS))
+kernels: $(KERNELS)
+kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
 
 ALL += $(KERNELS)
 # this is to mark on which image a given rpm is supposed to go
@@ -41,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
@@ -52,8 +62,17 @@ 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
+# 
+wireless-tools-MODULES := wireless-tools
+wireless-tools-SPEC := wireless-tools.spec
+wireless-tools-BUILD-FROM-SRPM := yes
+ALL += wireless-tools
+IN_BOOTSTRAPFS += wireless-tools
 
 #
 # libnl
@@ -200,11 +219,12 @@ IN_BOOTSTRAPFS += iproute
 #
 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
@@ -228,10 +248,8 @@ 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
 
@@ -267,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