X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=a2f679a2a45d710bb1613fb3bd98e6d0b9f289eb;hb=715d7b657b32d2ff7ef6a9bd25e2397f0c75e343;hp=43db25e881f93eca9fc20ec8be37ef3fca530873;hpb=d7a099685023698f0ca9168d419b0a00867d47e2;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index 43db25e8..a2f679a2 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -1,99 +1,137 @@
 #
 # 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$
 #
-
-#
-# Required:
-#
-# CVSROOT or package-CVSROOT: CVSROOT to use
-# together with 
-# TAG or package-TAG: CVS tag to use (only with CVSROOT)
-# or
-# SVNPATH or package-SVNPATH: SVNPATH to use
-# Note: do not define both CVSROOT and SVNPATH
-#
-# package-MODULE: name(s) of cvs/svn module(s) needed for building
-# package-SPEC: RPM spec file name
+# see doc in Makefile  
 #
-# Optional:
+
 #
-# package-RPMFLAGS: Miscellaneous RPM flags
-# package-RPMBUILD: If not rpmbuild
+# kernel
 #
-# Add to ALL if you want the package built as part of the default set.
+# use a package name with srpm in it:
+# so the source rpm is created by running make srpm in the codebase
 #
 
+kernel-MODULES := linux-patches
+kernel-SPEC := kernel-2.6.spec
+kernel-BUILD-FROM-SRPM := yes
+ifeq "$(HOSTARCH)" "i386"
+kernel-RPMFLAGS:= --target i686
+else
+kernel-RPMFLAGS:= --target $(HOSTARCH)
+endif
+KERNELS += kernel
+
+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
+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
+
 #
-# Default values -- should be able to override these from command line
+# madwifi
 #
-HOSTARCH := $(shell uname -i)
-DISTRO := $(shell ./getdistro.sh)
-RELEASE := $(shell ./getrelease.sh)
+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
 
 #
-# load in a release specific tags file
-# Override TAGSFILE from command line to select something else
-#
+# 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
 
 #
-# kernel
+# libnl
 #
-kernel-$(HOSTARCH)-MODULE := Linux-2.6
-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)
-
-kernel: $(KERNELS)
-kernel-clean: $(foreach package,$(KERNELS),$(package)-clean)
-
-ALL += $(KERNELS)
+# [daniel]    wait for latest Fedora release 
+# (03:29:46 PM) daniel_hozac: interfacing with the kernel directly when dealing with netlink was fugly, so... i had to find something nicer.
+# (03:29:53 PM) daniel_hozac: the one in Fedora is lacking certain APIs i need.
+#
+libnl-MODULES := libnl
+libnl-SPEC := libnl.spec
+ALL += libnl
 
 #
 # util-vserver
 #
-util-vserver-MODULE := util-vserver
+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
 #
-NodeUpdate-MODULE := NodeUpdate
+NodeUpdate-MODULES := NodeUpdate
 NodeUpdate-SPEC := NodeUpdate.spec
 ALL += NodeUpdate
+IN_BOOTSTRAPFS += NodeUpdate
 
 #
 # ipod
 #
-PingOfDeath-MODULE := PingOfDeath
-PingOfDeath-SPEC := ipod.spec
-ALL += PingOfDeath
+ipod-MODULES := PingOfDeath
+ipod-SPEC := ipod.spec
+ALL += ipod
+IN_BOOTSTRAPFS += ipod
 
 #
 # NodeManager
 #
-NodeManager-MODULE := NodeManager
+NodeManager-MODULES := NodeManager
 NodeManager-SPEC := NodeManager.spec
 ALL += NodeManager
+IN_BOOTSTRAPFS += NodeManager
 
 #
 # pl_sshd
 #
-pl_sshd-MODULE := pl_sshd
+pl_sshd-MODULES := pl_sshd
 pl_sshd-SPEC := pl_sshd.spec
 ALL += pl_sshd
+IN_BOOTSTRAPFS += pl_sshd
 
 #
 # libhttpd++: 
@@ -101,195 +139,229 @@ ALL += pl_sshd
 # Deprecate when vsys takes over [sapan].
 # keep in build for proper.
 #
-libhttpd++-MODULE := libhttpd++
-libhttpd++-SPEC := libhttpd++.spec
-ALL += libhttpd++
+libhttpd-MODULES := libhttpd++
+libhttpd-SPEC := libhttpd++.spec
+ALL += libhttpd
+IN_BOOTSTRAPFS += libhttpd
 
 #
-# Proper: Privileged Operations Service
+# proper: Privileged Operations Service
 #
-proper-MODULE := proper
+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
+proper-DEPEND-DEVEL-RPMS := libhttpd++-devel
 ALL += proper
+IN_BOOTSTRAPFS += proper
 
 #
-# CoDemux: Port 80 demux
+# codemux: Port 80 demux
 #
-CoDemux-MODULE := CoDemux
-CoDemux-SPEC   := codemux.spec
-CoDemux-RPMBUILD := sudo bash ./rpmbuild.sh
-ALL += CoDemux
+codemux-MODULES := CoDemux
+codemux-SPEC   := codemux.spec
+codemux-RPMBUILD := sudo bash ./rpmbuild.sh
+ALL += codemux
+IN_BOOTSTRAPFS += codemux
 
 #
 # ulogd
 #
-ulogd-MODULE := ulogd
+ulogd-MODULES := ulogd
 ulogd-SPEC := ulogd.spec
-ulogd-DEPENDS := $(KERNELS) proper
+ulogd-DEPEND-DEVEL-RPMS := kernel-devel proper-libs proper-devel
 ALL += ulogd
+IN_VSERVER += ulogd
 
 #
-# PlanetFlow
+# fprobe-ulog
 #
-PlanetFlow-MODULE := PlanetFlow
-PlanetFlow-SPEC := netflow.spec
-PlanetFlow-SPECVARS := distroname=$(DISTRO) distrorelease=$(RELEASE)
-ALL += PlanetFlow
+fprobe-ulog-MODULES := fprobe-ulog
+fprobe-ulog-SPEC := fprobe-ulog.spec
+ALL += fprobe-ulog
+IN_BOOTSTRAPFS += fprobe-ulog
+
+#
+# pf2slice
+#
+pf2slice-MODULES := pf2slice
+pf2slice-SPEC := pf2slice.spec
+ALL += pf2slice
+
+
+#
+# netflow
+#
+netflow-MODULES := PlanetFlow
+netflow-SPEC := netflow.spec
+ALL += netflow
+IN_BOOTSTRAPFS += netflow
 
 #
 # PlanetLab Mom: Cleans up your mess
 #
-Mom-MODULE := Mom
-Mom-SPEC := pl_mom.spec
-ALL += Mom
+pl_mom-MODULES := Mom
+pl_mom-SPEC := pl_mom.spec
+ALL += pl_mom
+IN_BOOTSTRAPFS += pl_mom
 
 #
 # iptables
 #
-iptables-MODULE := iptables
+iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-iptables-DEPENDS := $(KERNELS)
+iptables-DEPEND-DEVEL-RPMS := kernel-devel
 ALL += iptables
+IN_BOOTSTRAPFS += iptables
 
 #
 # iproute
 #
-iproute-MODULE := iproute2
+iproute-MODULES := iproute2
 iproute-SPEC := iproute.spec
 ALL += iproute
-
-#
-# util-python
-#
-# [marc]    deprecate with proper
-#
-util-python-MODULE := util-python
-util-python-SPEC := util-python.spec
-ALL += util-python
+IN_BOOTSTRAPFS += iproute
 
 #
 # vsys
 #
-vsys-MODULE := 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
 #
-PLCAPI-MODULE := PLCAPI
+PLCAPI-MODULES := PLCAPI
 PLCAPI-SPEC := PLCAPI.spec
 ALL += PLCAPI
+IN_MYPLC += PLCAPI
 
 #
 # PLCWWW
 #
-PLCWWW-MODULE := WWW
+PLCWWW-MODULES := PLCWWW
 PLCWWW-SPEC := PLCWWW.spec
 ALL += PLCWWW
+IN_MYPLC += PLCWWW
 
 #
-# BootManager
+# nodeconfig
 #
-BootManager-MODULE := BootManager build
-BootManager-SPEC := bootmanager.spec
-# Package must be built as root
-BootManager-RPMBUILD := sudo bash ./rpmbuild.sh
-ALL += BootManager
-
-# we do not want BootCD to depend on vserver-reference, do we ?
-ALL-REGULARS := $(ALL)
+nodeconfig-MODULES := nodeconfig
+nodeconfig-SPEC := nodeconfig.spec
+ALL += nodeconfig
+IN_MYPLC += nodeconfig
 
 #
-# vserver-reference
+# bootmanager
 #
-VserverReference-MODULE := VserverReference build
-VserverReference-SPEC := vserver-reference.spec
-# Package must be built as root
-VserverReference-RPMBUILD := sudo bash ./rpmbuild.sh
-# package requires all regular packages
-VserverReference-DEPENDS := $(ALL-REGULARS)
-VserverReference-DEPENDFILES := RPMS/yumgroups.xml
-ALL += VserverReference
+bootmanager-MODULES := BootManager
+bootmanager-SPEC := bootmanager.spec
+ALL += bootmanager
+IN_MYPLC += bootmanager
 
 #
-# BootCD
-#
-BootCD-MODULE := BootCD BootManager build
-BootCD-SPEC := bootcd.spec
-BootCD-RPMBUILD := sudo bash ./rpmbuild.sh
-# package has *some* dependencies, at least these ones
-BootCD-DEPENDS := $(KERNELS)
-BootCD-DEPENDFILES := RPMS/yumgroups.xml
-ALL += BootCD
+# pypcilib : used in bootcd
+# 
+pypcilib-MODULES := pypcilib
+pypcilib-SPEC := pypcilib.spec
+ALL += pypcilib
+IN_BOOTCD += pypcilib
 
 #
-# BootstrapFS
+# bootcd
 #
-BootstrapFS-MODULE := 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
-ALL += BootstrapFS
+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
+ALL += bootcd
+IN_MYPLC += bootcd
 
 #
-# MyPLC
+# vserver : reference image for slices
 #
-MyPLC-MODULE := MyPLC build
-MyPLC-SPEC := myplc.spec
+vserver-MODULES := VserverReference build
+vserver-SPEC := vserver-reference.spec
 # Package must be built as root
-MyPLC-RPMBUILD := sudo bash ./rpmbuild.sh
-# MyPLC may require all packages
-MyPLC-DEPENDS := $(filter-out MyPLC,$(ALL))
-MyPLC-DEPENDFILES := RPMS/yumgroups.xml
-ALL += MyPLC
+vserver-RPMBUILD := sudo bash ./rpmbuild.sh
+# 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
+ALL += vserver
+IN_BOOTSTRAPFS += vserver
 
 #
-# MyPLC native
+# bootstrapfs
 #
-MyPLC-native-MODULE := MyPLC build 
-MyPLC-native-SPEC := myplc-native.spec
-# Package must be built as root
-MyPLC-native-RPMBUILD := sudo bash ./rpmbuild.sh
-# Thierry : I don't think we depend on these at build-time
-#MyPLC-native-DEPENDS := $(MyPLC-DEPENDS)
-# Thierry : dunno about this one, let's stay safe
-MyPLC-native-DEPENDFILES := $(MyPLC-DEPENDFILES)
-#ALL += MyPLC-native
+bootstrapfs-MODULES := BootstrapFS build
+bootstrapfs-SPEC := bootstrapfs.spec
+bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh
+# package requires all regular packages
+bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
+bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
+ALL += bootstrapfs
+IN_MYPLC += bootstrapfs
 
 #
-# MyPLC development environment
+# noderepo
 #
-MyPLC-devel-MODULE := MyPLC build 
-MyPLC-devel-SPEC := myplc-devel.spec
-MyPLC-devel-RPMBUILD := sudo bash ./rpmbuild.sh
-#ALL += MyPLC-devel
+# 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 native development environment
+# myplc : initial, chroot-based packaging
 #
-MyPLC-devel-native-MODULE := MyPLC
-MyPLC-devel-native-SPECVARS := distroname=$(DISTRO) distrorelease=$(RELEASE)
-MyPLC-devel-native-SPEC := myplc-devel-native.spec
-#ALL += MyPLC-devel-native
+myplc-MODULES := MyPLC build
+myplc-SPEC := myplc.spec
+# Package must be built as root
+myplc-RPMBUILD := sudo bash ./rpmbuild.sh
+# myplc may require all packages
+myplc-DEPEND-PACKAGES := $(IN_MYPLC)
+myplc-DEPEND-FILES := RPMS/yumgroups.xml myplc-release
+ALL += myplc
 
 #
-# libnl
+# MyPLC native : lightweight packaging, dependencies are yum-installed in a vserver
 #
-# [daniel]    wait for latest Fedora release 
-# (03:29:46 PM) daniel_hozac: interfacing with the kernel directly when dealing with netlink was fugly, so... i had to find something nicer.
-# (03:29:53 PM) daniel_hozac: the one in Fedora is lacking certain APIs i need.
-#
-libnl-MODULE := libnl
-libnl-SPEC := libnl.spec
-ALL += libnl
+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 anything at build-time
+#myplc-native-DEPEND-PACKAGES :=
+# Thierry : dunno about this one, let's stay safe
+myplc-native-DEPEND-FILES := myplc-release
+ALL += myplc-native