X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=de91b8e68c16a78d623c6de9971b2478beaf6149;hb=cb23cf4fbc5bb4def4b921c11433f01f01304215;hp=016b7b1885e3730b66241b7f103176a693f4c5e7;hpb=9fd98b5cef76e6824d83097e668f0d90500acf6f;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index 016b7b18..de91b8e6 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$
 #
@@ -16,8 +17,8 @@
 # so the source rpm is created by running make srpm in the codebase
 #
 
-kernel-MODULES := linux-patches
-kernel-SPEC := kernel-2.6-planetlab.spec
+kernel-MODULES := linux-2.6
+kernel-SPEC := kernel-2.6.spec
 kernel-BUILD-FROM-SRPM := yes
 ifeq "$(HOSTARCH)" "i386"
 kernel-RPMFLAGS:= --target i686
@@ -38,9 +39,19 @@ IN_BOOTSTRAPFS += $(KERNELS)
 IN_MYPLC += $(KERNELS)
 
 #
-# madwifi
+# kexec-tools
 #
-# [thierry] - temporarily use onelab's svn
+ifeq "$(DISTRONAME)" "fc4"
+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
+
+#
+# madwifi
 #
 madwifi-MODULES := madwifi
 madwifi-SPEC := madwifi.spec
@@ -49,8 +60,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 +72,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
 #
@@ -184,6 +179,14 @@ fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
 IN_BOOTSTRAPFS += fprobe-ulog
 
+#
+# pf2slice
+#
+pf2slice-MODULES := pf2slice
+pf2slice-SPEC := pf2slice.spec
+ALL += pf2slice
+
+
 #
 # netflow
 #
@@ -220,16 +223,24 @@ IN_BOOTSTRAPFS += iproute
 #
 # vsys
 #
+vsys_support=yes
+ifeq "$(DISTRONAME)" "fc4"
+vsys_support=
+endif
+ifeq "$(DISTRONAME)" "fc6"
+vsys_support=
+endif
+# cannot find the required packages (see devel.pkgs) on centos5
+ifeq "$(DISTRONAME)" "centos5"
+vsys_support=
+endif
+
+ifeq "$(vsys_support)" "yes"
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
-ifeq "$(DISTRO)" "Fedora"
-ifeq "$(RELEASE)" "7"
-ALL += vsys
-endif
-ifeq "$(RELEASE)" "8"
+IN_BOOTSTRAPFS += vsys
 ALL += vsys
 endif
-endif
 
 #
 # PLCAPI
@@ -242,11 +253,27 @@ IN_MYPLC += PLCAPI
 #
 # PLCWWW
 #
-PLCWWW-MODULES := WWW
+PLCWWW-MODULES := PLCWWW
 PLCWWW-SPEC := PLCWWW.spec
 ALL += PLCWWW
 IN_MYPLC += PLCWWW
 
+#
+# monitor
+#
+Monitor-MODULES := Monitor
+Monitor-SPEC := Monitor.spec
+ALL += Monitor
+IN_BOOTSTRAPFS += Monitor
+
+#
+# nodeconfig
+#
+nodeconfig-MODULES := nodeconfig
+nodeconfig-SPEC := nodeconfig.spec
+ALL += nodeconfig
+IN_MYPLC += nodeconfig
+
 #
 # bootmanager
 #
@@ -287,7 +314,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
@@ -301,6 +328,26 @@ bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
 ALL += bootstrapfs
 IN_MYPLC += bootstrapfs
 
+#
+# noderepo
+#
+# all rpms resulting from packages marked as being in bootstrapfs and vserver
+NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms))
+# replace space with +++ (specvars cannot deal with spaces)
+SPACE=$(subst x, ,x)
+NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
+
+noderepo-MODULES := BootstrapFS 
+noderepo-SPEC := noderepo.spec
+noderepo-RPMBUILD := sudo bash ./rpmbuild.sh
+# package requires all regular packages
+noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
+noderepo-DEPEND-FILES := RPMS/yumgroups.xml
+#export rpm list to the specfile
+noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
+ALL += noderepo
+IN_MYPLC += noderepo
+
 #
 # myplc : initial, chroot-based packaging
 #