X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=64f45cb1926a90cd274f5b90c978c2d30490e945;hb=5227765b6399259b227b5da70234445f0ab42931;hp=50ff0d3dd85129c9ec2098513e3b186490edca43;hpb=4718a7e575b785b00027022dd54cdb41bac9786d;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index 50ff0d3d..64f45cb1 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -1,53 +1,76 @@
 #
 # 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$
 #
 # see doc in Makefile  
 #
+
 #
 # kernel
 #
-# until we are able to build the new kernel layout:
-# use the old exploded-tree, 2.6.20-based, version on fc4, 6 & 7
-# and the new one on f8 - that requires the build-id patch
-
-# 
 # use a package name with srpm in it:
-# in this case the srpm is created by running make srpm in the codebase
+# so the source rpm is created by running make srpm in the codebase
 #
 
-srpm-kernel-$(HOSTARCH)-MODULES := linux-patches
-srpm-kernel-$(HOSTARCH)-SPEC := kernel-2.6-planetlab.spec
-ifeq ($(HOSTARCH),i386)
-srpm-kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
+kernel-MODULES := linux-2.6
+kernel-SPEC := kernel-2.6.spec
+kernel-BUILD-FROM-SRPM := yes
+ifeq "$(HOSTARCH)" "i386"
+kernel-RPMFLAGS:= --target i686
 else
-srpm-kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
+kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
-KERNELS += srpm-kernel-$(HOSTARCH)
-
-#else
-#kernel-$(HOSTARCH)-MODULES := linux-tree
-#kernel-$(HOSTARCH)-SPEC := scripts/kernel-2.6-planetlab.spec
-#ifeq ($(HOSTARCH),i386)
-#kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
-#else
-#kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
-#endif
-#KERNELS += kernel-$(HOSTARCH)
-#endif
+KERNELS += kernel
 
-kernel: $(KERNELS)
-	sudo rpm -Uvh RPMS/i686/kernel-devel*.rpm
+kernels: $(KERNELS)
+kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
 
-kernel-clean: $(foreach package,$(KERNELS),$(package)-clean)
+ALL += $(KERNELS)
+# this is to mark on which image a given rpm is supposed to go
+IN_BOOTCD += $(KERNELS)
+IN_VSERVER += $(KERNELS)
+IN_BOOTSTRAPFS += $(KERNELS)
+# turns out myplc installs kernel-vserver
+IN_MYPLC += $(KERNELS)
+
+#
+# kexec-tools
+#
+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
 
-kernel-devel: $(KERNELS)
+#
+# madwifi
+#
+madwifi-MODULES := madwifi
+madwifi-SPEC := madwifi.spec
+madwifi-BUILD-FROM-SRPM := yes
+madwifi-DEPEND-DEVEL-RPMS := kernel-devel
+madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
+	kernel_release=$(kernel.rpm-release) \
+	kernel_arch=$(kernel.rpm-arch)
+ALL += madwifi
+IN_BOOTSTRAPFS += madwifi
 
-ALL += $(KERNELS)
+#
+# 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
@@ -66,8 +89,17 @@ ALL += libnl
 util-vserver-MODULES := util-vserver
 util-vserver-SPEC := util-vserver.spec
 util-vserver-RPMFLAGS:= --without dietlibc
-util-vserver-DEPENDS := libnl
 ALL += util-vserver
+IN_BOOTSTRAPFS += util-vserver
+
+#
+# util-vserver-pl
+#
+util-vserver-pl-MODULES := util-vserver-pl
+util-vserver-pl-SPEC := util-vserver-pl.spec
+util-vserver-pl-DEPEND-DEVEL-RPMS := libnl libnl-devel util-vserver-lib util-vserver-devel util-vserver-core
+ALL += util-vserver-pl
+IN_BOOTSTRAPFS += util-vserver-pl
 
 #
 # NodeUpdate
@@ -75,13 +107,15 @@ ALL += util-vserver
 NodeUpdate-MODULES := NodeUpdate
 NodeUpdate-SPEC := NodeUpdate.spec
 ALL += NodeUpdate
+IN_BOOTSTRAPFS += NodeUpdate
 
 #
 # ipod
 #
-PingOfDeath-MODULES := PingOfDeath
-PingOfDeath-SPEC := ipod.spec
-ALL += PingOfDeath
+ipod-MODULES := PingOfDeath
+ipod-SPEC := ipod.spec
+ALL += ipod
+IN_BOOTSTRAPFS += ipod
 
 #
 # NodeManager
@@ -89,6 +123,7 @@ ALL += PingOfDeath
 NodeManager-MODULES := NodeManager
 NodeManager-SPEC := NodeManager.spec
 ALL += NodeManager
+IN_BOOTSTRAPFS += NodeManager
 
 #
 # pl_sshd
@@ -96,27 +131,7 @@ ALL += NodeManager
 pl_sshd-MODULES := pl_sshd
 pl_sshd-SPEC := pl_sshd.spec
 ALL += pl_sshd
-
-#
-# libhttpd++: 
-#
-# Deprecate when vsys takes over [sapan].
-# keep in build for proper.
-#
-libhttpd++-MODULES := libhttpd++
-libhttpd++-SPEC := libhttpd++.spec
-ALL += libhttpd++
-
-#
-# proper: Privileged Operations Service
-#
-proper-MODULES := proper
-proper-SPEC := proper.spec
-proper-RPMBUILD := sudo bash ./rpmbuild.sh
-# proper uses scripts in util-python for building
-proper-DEPENDS := libhttpd++ util-python
-# disabled temporarily (or ?)
-#ALL += proper
+IN_BOOTSTRAPFS += pl_sshd
 
 #
 # codemux: Port 80 demux
@@ -125,14 +140,7 @@ codemux-MODULES := CoDemux
 codemux-SPEC   := codemux.spec
 codemux-RPMBUILD := sudo bash ./rpmbuild.sh
 ALL += codemux
-
-#
-# ulogd
-#
-ulogd-MODULES := ulogd
-ulogd-SPEC := ulogd.spec
-ulogd-DEPENDS := kernel-devel proper
-ALL += ulogd
+IN_BOOTSTRAPFS += codemux
 
 #
 # fprobe-ulog
@@ -140,13 +148,14 @@ ALL += ulogd
 fprobe-ulog-MODULES := fprobe-ulog
 fprobe-ulog-SPEC := fprobe-ulog.spec
 ALL += fprobe-ulog
+IN_BOOTSTRAPFS += fprobe-ulog
 
 #
-# netflow
+# pf2slice
 #
-netflow-MODULES := PlanetFlow
-netflow-SPEC := netflow.spec
-ALL += netflow
+pf2slice-MODULES := pf2slice
+pf2slice-SPEC := pf2slice.spec
+ALL += pf2slice
 
 #
 # PlanetLab Mom: Cleans up your mess
@@ -154,14 +163,16 @@ ALL += netflow
 pl_mom-MODULES := Mom
 pl_mom-SPEC := pl_mom.spec
 ALL += pl_mom
+IN_BOOTSTRAPFS += pl_mom
 
 #
 # iptables
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-iptables-DEPENDS :=kernel-devel
+iptables-DEPEND-DEVEL-RPMS := kernel-devel
 ALL += iptables
+IN_BOOTSTRAPFS += iptables
 
 #
 # iproute
@@ -169,26 +180,29 @@ ALL += iptables
 iproute-MODULES := iproute2
 iproute-SPEC := iproute.spec
 ALL += iproute
-
-#
-# util-python
-#
-# [marc]    deprecate with proper
-#
-util-python-MODULES := util-python
-util-python-SPEC := util-python.spec
-ALL += util-python
+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)
+IN_BOOTSTRAPFS += vsys
 ALL += vsys
 endif
-endif
 
 #
 # PLCAPI
@@ -196,22 +210,39 @@ endif
 PLCAPI-MODULES := PLCAPI
 PLCAPI-SPEC := PLCAPI.spec
 ALL += PLCAPI
+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
 #
-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
 
 #
 # pypcilib : used in bootcd
@@ -219,9 +250,20 @@ ALL += bootmanager
 pypcilib-MODULES := pypcilib
 pypcilib-SPEC := pypcilib.spec
 ALL += pypcilib
+IN_BOOTCD += pypcilib
 
-# copy the current list, so as to keep image-building rpms out
-ALL-REGULARS := $(ALL)
+#
+# bootcd
+#
+bootcd-MODULES := BootCD build
+bootcd-SPEC := bootcd.spec
+bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
+# package has *some* dependencies, at least these ones
+bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
+bootcd-DEPEND-FILES := RPMS/yumgroups.xml
+bootcd-RPMDATE := yes
+ALL += bootcd
+IN_MYPLC += bootcd
 
 #
 # vserver : reference image for slices
@@ -230,21 +272,13 @@ vserver-MODULES := VserverReference build
 vserver-SPEC := vserver-reference.spec
 # Package must be built as root
 vserver-RPMBUILD := sudo bash ./rpmbuild.sh
-# package requires all regular packages
-vserver-DEPENDS := $(ALL-REGULARS)
-vserver-DEPENDFILES := RPMS/yumgroups.xml
+# this list is useful for manual builds only, since nightly builds 
+# always redo all sequentially - try to keep updated
+vserver-DEPEND-PACKAGES := $(IN_VSERVER)
+vserver-DEPEND-FILES := RPMS/yumgroups.xml
+vserver-RPMDATE := yes
 ALL += vserver
-
-#
-# bootcd
-#
-bootcd-MODULES := BootCD BootManager build
-bootcd-SPEC := bootcd.spec
-bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
-# package has *some* dependencies, at least these ones
-bootcd-DEPENDS := $(ALL-REGULARS)
-bootcd-DEPENDFILES := RPMS/yumgroups.xml
-ALL += bootcd
+IN_BOOTSTRAPFS += vserver
 
 #
 # bootstrapfs
@@ -253,9 +287,32 @@ bootstrapfs-MODULES := BootstrapFS build
 bootstrapfs-SPEC := bootstrapfs.spec
 bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh
 # package requires all regular packages
-bootstrapfs-DEPENDS := $(ALL-REGULARS)
-bootstrapfs-DEPENDFILES := RPMS/yumgroups.xml
+bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
+bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
+bootstrapfs-RPMDATE := yes
 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)
+noderepo-RPMDATE := yes
+ALL += noderepo
+IN_MYPLC += noderepo
 
 #
 # myplc : initial, chroot-based packaging
@@ -265,8 +322,9 @@ myplc-SPEC := myplc.spec
 # Package must be built as root
 myplc-RPMBUILD := sudo bash ./rpmbuild.sh
 # myplc may require all packages
-myplc-DEPENDS := $(filter-out vserver,$(ALL))
-myplc-DEPENDFILES := RPMS/yumgroups.xml
+myplc-DEPEND-PACKAGES := $(IN_MYPLC)
+myplc-DEPEND-FILES := RPMS/yumgroups.xml myplc-release
+myplc-RPMDATE := yes
 ALL += myplc
 
 #
@@ -276,23 +334,9 @@ myplc-native-MODULES := MyPLC build
 myplc-native-SPEC := myplc-native.spec
 # Package must be built as root
 myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh
-# Thierry : don't depend on these at build-time
-#myplc-native-DEPENDS := $(MyPLC-DEPENDS)
+# Thierry : don't depend on anything at build-time
+#myplc-native-DEPEND-PACKAGES :=
 # Thierry : dunno about this one, let's stay safe
-myplc-native-DEPENDFILES := $(MyPLC-DEPENDFILES)
-#ALL += myplc-native
-
-#
-# MyPLC development environment : chroot-based 
-#
-myplc-devel-MODULES := MyPLC build 
-myplc-devel-SPEC := myplc-devel.spec
-myplc-devel-RPMBUILD := sudo bash ./rpmbuild.sh
-#ALL += myplc-devel
+myplc-native-DEPEND-FILES := myplc-release
+ALL += myplc-native
 
-#
-# MyPLC native development environment
-#
-myplc-devel-native-MODULES := MyPLC
-myplc-devel-native-SPEC := myplc-devel-native.spec
-#ALL += myplc-devel-native