X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=169cff9074bbcd18d1b1fcd151daa6cb0423260c;hb=94bea8db3940979868e25affde141743cae3c669;hp=670be1cce4d97f408c0581e6f30007bcbc022d83;hpb=82d0ea88d1a4213e553b6d3d276aeef26a81bd1d;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index 670be1cc..169cff90 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -1,154 +1,139 @@
 #
 # 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: planetlab.mk,v 1.71 2007/09/25 18:38:47 faiyaza Exp $
-#
-
-#
-# Required:
-#
-# CVSROOT or package-CVSROOT: CVSROOT to use
-# or
-# SVNPATH or package-SVNPATH: SVNPATH to use
-# Note: do not define both CVSROOT and SVNPATH
+# $Id$
 #
-# TAG or package-TAG: CVS/SVN tag to use
-# package-MODULE: CVS/SVN module name to use
-# package-SPEC: RPM spec file template
-#
-# Optional:
-#
-# package-RPMFLAGS: Miscellaneous RPM flags
-# package-RPMBUILD: If not rpmbuild
-# package-CVS_RSH: If not ssh for cvs
-#
-# Add to ALL if you want the package built as part of the default set.
+# see doc in Makefile  
 #
 
-#
-# Default values -- should be able to override these from command line
-#
-
-HOSTARCH := $(shell uname -i)
-DISTRO := $(shell ./getdistro.sh)
-RELEASE := $(shell ./getrelease.sh)
-
-#
-# load in a release specific tags file
-# Override TAGSFILE from command line to select something else
-#
-TAGSFILE = default-tags.mk
-include $(TAGSFILE)
-
-
 #
 # kernel
 #
+# use a package name with srpm in it:
+# so the source rpm is created by running make srpm in the codebase
+#
 
-kernel-$(HOSTARCH)-MODULE := Linux-2.6
-kernel-$(HOSTARCH)-SPEC := scripts/kernel-2.6-planetlab.spec
-ifeq ($(HOSTARCH),i386)
-kernel-$(HOSTARCH)-RPMFLAGS:= --target i686
+kernel-MODULES := linux-patches
+kernel-SPEC := kernel-2.6.spec
+kernel-BUILD-FROM-SRPM := yes
+ifeq "$(HOSTARCH)" "i386"
+kernel-RPMFLAGS:= --target i686
 else
-kernel-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH)
+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 "$(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
-
-ALL += kernel-$(HOSTARCH)
-
-kernel-clean: kernel-$(HOSTARCH)-clean
-kernel: kernel-$(HOSTARCH)
 
 #
-# util-vserver
+# 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
 
-util-vserver-MODULE := util-vserver
-util-vserver-SPEC := util-vserver.spec
-util-vserver-RPMFLAGS:= --without dietlibc
-ALL += util-vserver
-
-#
-# NodeUpdate
 #
-
-NodeUpdate-MODULE := NodeUpdate
-NodeUpdate-SPEC := NodeUpdate.spec
-ALL += NodeUpdate
+# 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
 
 #
-# PlanetLabConf:  DEPRECATED.  
+# libnl
 #
-# conf_files does the same thing in NM
+# [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.
 #
-
-#PlanetLabConf-MODULE := PlanetLabConf
-#PlanetLabConf-SPEC := PlanetLabConf/PlanetLabConf.spec
-#ALL += PlanetLabConf
+libnl-MODULES := libnl
+libnl-SPEC := libnl.spec
+ALL += libnl
 
 #
-# ipod
+# util-vserver
 #
+util-vserver-MODULES := util-vserver
+util-vserver-SPEC := util-vserver.spec
+util-vserver-RPMFLAGS:= --without dietlibc
+ALL += util-vserver
+IN_BOOTSTRAPFS += util-vserver
 
-PingOfDeath-MODULE := PingOfDeath
-PingOfDeath-SPEC := ipod.spec
-ALL += PingOfDeath
-
-#
-# sudo:  DEPRECATED
 #
-# Added functionality provided by this package to www/PlanetLabConf/sudoers.
+# 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
 
-#sudo-MODULE := sudo
-#sudo-SPEC := sudo/planetlab_sudo.spec
-#ALL += sudo
-
-#
-# pycurl:  DEPRECATE
 #
-# [tony] use FC6+ release
+# NodeUpdate
 #
+NodeUpdate-MODULES := NodeUpdate
+NodeUpdate-SPEC := NodeUpdate.spec
+ALL += NodeUpdate
+IN_BOOTSTRAPFS += NodeUpdate
 
-#curl_vernum := $(shell printf %d 0x$(shell curl-config --vernum))
-#pycurl_vernum := $(shell printf %d 0x070d01) # 7.13.1
-#pycurl_incompatnum := $(shell printf %d 0x071000) # 7.16.0
-#ifeq ($(shell test $(curl_vernum) -ge $(pycurl_vernum) && echo 1),1)
-#ifeq ($(shell test $(curl_vernum) -ge $(pycurl_incompatnum) && echo 0),1)
-#pycurl-MODULE := pycurl
-#pycurl-SPEC := pycurl/pycurl.spec
-#ALL += pycurl
-#endif
-#endif
-
-#
-# BootServerRequest:  DEPRECATE
 #
-# Not used by anything.
+# ipod
 #
+ipod-MODULES := PingOfDeath
+ipod-SPEC := ipod.spec
+ALL += ipod
+IN_BOOTSTRAPFS += ipod
 
-#BootServerRequest-MODULE := BootServerRequest
-#BootServerRequest-SPEC := BootServerRequest/PLBootServerRequest.spec
-#ALL += BootServerRequest
-#
 #
+# NodeManager
 #
-# Node Manager
-#
-
-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++: 
@@ -156,327 +141,186 @@ 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-DEPEND-DEVEL-RPMS := libhttpd++-devel
 ALL += proper
-
-proper: libhttpd++
-
-#
-# CoDemux: Port 80 demux
-#
-
-CoDemux-MODULE := CoDemux
-CoDemux-SPEC   := codemux.spec
-CoDemux-RPMBUILD := sudo bash ./rpmbuild.sh
-ALL += CoDemux
+IN_BOOTSTRAPFS += proper
 
 #
-# MySQL
+# codemux: Port 80 demux
 #
-
-mysql-MODULE := mysql
-mysql-SPEC := mysql.spec
-#ALL += mysql
+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-DEPEND-DEVEL-RPMS := kernel-devel proper-libs proper-devel
 ALL += ulogd
+IN_VSERVER += ulogd
 
-ulogd: kernel proper #mysql
+#
+# fprobe-ulog
+#
+fprobe-ulog-MODULES := fprobe-ulog
+fprobe-ulog-SPEC := fprobe-ulog.spec
+ALL += fprobe-ulog
+IN_BOOTSTRAPFS += fprobe-ulog
 
 #
 # netflow
 #
-
-PlanetFlow-MODULE := PlanetFlow
-PlanetFlow-RPMFLAGS := --define "distroname '$(DISTRO)'" --define "distrorelease $(RELEASE)"
-PlanetFlow-SPEC := netflow.spec
-ALL += PlanetFlow
-
-PlanetFlow: #mysql
+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-DEPEND-DEVEL-RPMS := kernel-devel
 ALL += iptables
-
-iptables: kernel
+IN_BOOTSTRAPFS += iptables
 
 #
 # iproute
 #
-
-iproute-MODULE := iproute2
+iproute-MODULES := iproute2
 iproute-SPEC := iproute.spec
 ALL += iproute
-
-#
-# kexec-tools:  DEPRECATE
-#
-# [marc]    use FC6+ release
-#
-
-#kexec-tools-MODULE := kexec-tools
-#kexec-tools-SPEC := kexec-tools/kexec-tools.spec
-#ALL += kexec-tools
-
-#
-# util-python
-#
-# [marc]    deprecate with proper
-#
-
-util-python-MODULE := util-python
-util-python-SPEC := util-python.spec
-ALL += util-python
-
-# proper uses scripts in util-python for building
-proper: util-python
+IN_BOOTSTRAPFS += iproute
 
 #
 # vsys
 #
-vsys-MODULE := vsys
+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"
 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
 
 #
-# vserver-reference
+# bootmanager
 #
-
-VserverReference-MODULE := VserverReference build
-VserverReference-SPEC := vserver-reference.spec
-# Package must be built as root
-VserverReference-RPMBUILD := sudo bash ./rpmbuild.sh
-ALL += VserverReference
-
-# vserver-reference may require current packages
-VserverReference: $(filter-out vserver-reference,$(ALL))
-
-# ... and the groups manifest
-VserverReference: RPMS/yumgroups.xml
-
+bootmanager-MODULES := BootManager
+bootmanager-SPEC := bootmanager.spec
+ALL += bootmanager
+IN_MYPLC += bootmanager
 
 #
-# BootManager
-#
-
-BootManager-MODULE := BootManager build
-BootManager-SPEC := bootmanager.spec
-# Package must be built as root
-BootManager-RPMBUILD := sudo bash ./rpmbuild.sh
-ALL += BootManager
+# pypcilib : used in bootcd
+# 
+pypcilib-MODULES := pypcilib
+pypcilib-SPEC := pypcilib.spec
+ALL += pypcilib
+IN_BOOTCD += pypcilib
 
 #
-# BootCD
+# bootcd
 #
-
-BootCD-MODULE := BootCD BootManager build
-BootCD-SPEC := bootcd.spec
-BootCD-RPMBUILD := sudo bash ./rpmbuild.sh
-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
+ALL += bootcd
+IN_MYPLC += bootcd
 
 #
-# BootstrapFS
+# vserver : reference image for slices
 #
-
-BootstrapFS-MODULE := BootstrapFS build
-BootstrapFS-SPEC := bootstrapfs.spec
+vserver-MODULES := VserverReference build
+vserver-SPEC := vserver-reference.spec
 # Package must be built as root
-BootstrapFS-RPMBUILD := sudo bash ./rpmbuild.sh
-ALL += BootstrapFS
-
-# BootstrapFS requires current packages
-BootstrapFS: $(filter-out BootstrapFS,$(ALL))
-
-# ... and the groups manifest
-BootstrapFS: RPMS/yumgroups.xml
+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
+# bootstrapfs
 #
-
-MyPLC-MODULE := MyPLC build WWW
-MyPLC-SPEC := myplc.spec
-# Package must be built as root
-MyPLC-RPMBUILD := sudo bash ./rpmbuild.sh
-ALL += MyPLC
-
-# MyPLC may require current packages
-MyPLC: $(filter-out MyPLC,$(ALL))
-
-# ...and the yum manifest
-MyPLC: RPMS/yumgroups.xml
-
+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 native
+# myplc : initial, chroot-based packaging
 #
-
-MyPLC-native-MODULE := MyPLC build WWW
-MyPLC-native-SPEC := myplc-native.spec
+myplc-MODULES := MyPLC build
+myplc-SPEC := myplc.spec
 # Package must be built as root
-MyPLC-native-RPMBUILD := sudo bash ./rpmbuild.sh
-ALL += MyPLC-native
-
-# MyPLC may require current packages
-MyPLC-native: $(filter-out MyPLC,$(ALL))
-
-# ...and the yum manifest
-MyPLC-native: RPMS/yumgroups.xml
+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
 
 #
-# MyPLC development environment
+# MyPLC native : lightweight packaging, dependencies are yum-installed in a vserver
 #
-
-MyPLC-devel-MODULE := MyPLC build 
-MyPLC-devel-SPEC := myplc-devel.spec
+myplc-native-MODULES := MyPLC build 
+myplc-native-SPEC := myplc-native.spec
 # Package must be built as root
-MyPLC-devel-RPMBUILD := sudo bash ./rpmbuild.sh
-#ALL += MyPLC-devel
-
-#
-# MyPLC native development environment
-#
-
-MyPLC-devel-native-MODULE := MyPLC
-MyPLC-devel-native-RPMFLAGS := --define "distroname '$(DISTRO)'" --define "distrorelease $(RELEASE)"
-MyPLC-devel-native-SPEC := myplc-devel-native.spec
-ALL += MyPLC-devel-native
-
-#
-# libnl
-#
-# [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
-
-util-vserver: libnl
-
-RPMS/yumgroups.xml:
-	install -D -m 644 groups/v4_yumgroups.xml RPMS/yumgroups.xml
-
-#XXX We need to rethink this installation support for several reasons:
-# 1) it is pldistro specific
-# 2) may involve installing files for different node groups (e.g., alpha, beta, etc.)
-# 3) may involve N rpm repositories to where it should be uploaded
-#
-# Not clear to me at all that this should be incorporated into a
-# Makefile at all.  Instead it should be something that gets wrapped
-# into a myplc (sub) rpm package and then is installed by that way.
-
-#
-# Installation rules
-# 
-
-# Upload packages to boot server
-SERVERA := build@boot1.planet-lab.org
-SERVERB := build@boot2.planet-lab.org
-ARCHIVE := /plc/data/var/www/html/install-rpms/archive
-
-# Put nightly alpha builds in a subdirectory
-ifeq ($(TAG),HEAD)
-ARCHIVE := $(ARCHIVE)/planetlab-alpha
-REPOS := /plc/data/var/www/html/install-rpms/planetlab-alpha
-endif
-
-install:
-ifeq ($(BASE),)
-	@echo make install is only meant to be called from ./build.sh
-else
-ifneq ($(wildcard /etc/planetlab/secring.gpg),)
-        # Sign all RPMS. setsid detaches rpm from the terminal,
-        # allowing the (hopefully blank) GPG password to be entered
-        # from stdin instead of /dev/tty. Obviously, the build server
-        # should be secure.
-	echo | setsid rpm \
-	--define "_signature gpg" \
-	--define "_gpg_path /etc/planetlab" \
-	--define "_gpg_name PlanetLab <info@planet-lab.org>" \
-	--resign RPMS/*/*.rpm
-endif
-ifneq ($(BUILDS),)
-        # Remove old runs
-	echo "cd $(ARCHIVE) && ls -t | sed -n $(BUILDS)~1p | xargs rm -rf" | ssh $(SERVERA) /bin/bash -s
-	echo "cd $(ARCHIVE) && ls -t | sed -n $(BUILDS)~1p | xargs rm -rf" | ssh $(SERVERB) /bin/bash -s
-endif
-        # Create package manifest
-	sh ./packages.sh -b "http://build.planet-lab.org/$(subst $(HOME)/,,$(shell pwd))/RPMS" RPMS > packages.xml
-        # Update yum metadata
-	yum-arch RPMS >/dev/null
-	createrepo -g yumgroups.xml RPMS >/dev/null
-        # Populate repository
-	rsync \
-	--exclude '*-debuginfo-*' \
-	--recursive --links --perms --times --group --compress --rsh=ssh \
-	RPMS/ $(SERVERA):$(ARCHIVE)/$(BASE)
-	rsync \
-	--exclude '*-debuginfo-*' \
-	--recursive --links --perms --times --group --compress --rsh=ssh \
-	RPMS/ $(SERVERB):$(ARCHIVE)/$(BASE)
-ifeq ($(TAG),HEAD)
-        # Update nightly alpha symlink if it does not exist or is broken, or it is Monday
-	if ! ssh $(SERVERA) "[ -e $(REPOS) ] && exit 0 || exit 1" || [ "$(shell date +%A)" = "Monday" ] ; then \
-	    ssh $(SERVERA) ln -nsf archive/$(BASE) $(REPOS) ; \
-	fi
-        # Update nightly alpha symlink if it does not exist or is broken, or it is Monday
-	if ! ssh $(SERVERB) "[ -e $(REPOS) ] && exit 0 || exit 1" || [ "$(shell date +%A)" = "Monday" ] ; then \
-	    ssh $(SERVERB) ln -nsf archive/$(BASE) $(REPOS) ; \
-	fi
-
-endif
-endif
+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
 
-.PHONY: install