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

diff --git a/planetlab.mk b/planetlab.mk
index 50ff0d3d..1c2fccd2 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -1,64 +1,55 @@
 #
-# PlanetLab standard components list
-#
+# declare the packages to be built and their dependencies
+# 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
-
-kernel-clean: $(foreach package,$(KERNELS),$(package)-clean)
-
-kernel-devel: $(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
+IN_BOOTCD += $(KERNELS)
+IN_VSERVER += $(KERNELS)
+IN_BOOTSTRAPFS += $(KERNELS)
+# turns out myplc installs kernel-vserver
+IN_MYPLC += $(KERNELS)
 
 #
-# 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.
+# madwifi
 #
-libnl-MODULES := libnl
-libnl-SPEC := libnl.spec
-ALL += libnl
+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
@@ -66,57 +57,72 @@ 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
 
 #
-# NodeUpdate
+# libnl - local import
+# we need either 1.1 or at least 1.0.pre6
+# rebuild this on centos5 - see kexcludes in build.common
 #
-NodeUpdate-MODULES := NodeUpdate
-NodeUpdate-SPEC := NodeUpdate.spec
-ALL += NodeUpdate
+local_libnl=false
+ifeq "$(DISTRONAME)" "centos5"
+local_libnl=true
+endif
+
+ifeq "$(local_libnl)" "true"
+libnl-MODULES := libnl
+libnl-SPEC := libnl.spec
+libnl-BUILD-FROM-SRPM := yes
+# this sounds like the thing to do, but in fact linux/if_vlan.h comes with kernel-headers
+libnl-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
+ALL += libnl
+IN_BOOTSTRAPFS += libnl
+endif
 
 #
-# ipod
+# util-vserver-pl
 #
-PingOfDeath-MODULES := PingOfDeath
-PingOfDeath-SPEC := ipod.spec
-ALL += PingOfDeath
+util-vserver-pl-MODULES := util-vserver-pl
+util-vserver-pl-SPEC := util-vserver-pl.spec
+util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core 
+ifeq "$(local_libnl)" "true"
+util-vserver-pl-DEPEND-DEVEL-RPMS += libnl libnl-devel
+endif
+ALL += util-vserver-pl
+IN_BOOTSTRAPFS += util-vserver-pl
 
 #
-# NodeManager
+# NodeUpdate
 #
-NodeManager-MODULES := NodeManager
-NodeManager-SPEC := NodeManager.spec
-ALL += NodeManager
+nodeupdate-MODULES := NodeUpdate
+nodeupdate-SPEC := NodeUpdate.spec
+ALL += nodeupdate
+IN_BOOTSTRAPFS += nodeupdate
 
 #
-# pl_sshd
+# ipod
 #
-pl_sshd-MODULES := pl_sshd
-pl_sshd-SPEC := pl_sshd.spec
-ALL += pl_sshd
+ipod-MODULES := PingOfDeath
+ipod-SPEC := ipod.spec
+ALL += ipod
+IN_BOOTSTRAPFS += ipod
 
 #
-# libhttpd++: 
-#
-# Deprecate when vsys takes over [sapan].
-# keep in build for proper.
+# NodeManager
 #
-libhttpd++-MODULES := libhttpd++
-libhttpd++-SPEC := libhttpd++.spec
-ALL += libhttpd++
+nodemanager-MODULES := NodeManager
+nodemanager-SPEC := NodeManager.spec
+ALL += nodemanager
+IN_BOOTSTRAPFS += nodemanager
 
 #
-# proper: Privileged Operations Service
+# pl_sshd
 #
-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
+sshd-MODULES := pl_sshd
+sshd-SPEC := pl_sshd.spec
+ALL += sshd
+IN_BOOTSTRAPFS += sshd
 
 #
 # codemux: Port 80 demux
@@ -125,14 +131,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,28 +139,31 @@ 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
 #
-pl_mom-MODULES := Mom
-pl_mom-SPEC := pl_mom.spec
-ALL += pl_mom
+mom-MODULES := Mom
+mom-SPEC := pl_mom.spec
+ALL += mom
+IN_BOOTSTRAPFS += mom
 
 #
 # iptables
 #
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
-iptables-DEPENDS :=kernel-devel
+iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
 ALL += iptables
+IN_BOOTSTRAPFS += iptables
 
 #
 # iproute
@@ -169,26 +171,45 @@ ALL += iptables
 iproute-MODULES := iproute2
 iproute-SPEC := iproute.spec
 ALL += iproute
+IN_BOOTSTRAPFS += iproute
+IN_VSERVER += iproute
+IN_BOOTCD += iproute
 
 #
-# util-python
+# inotify-tools - local import
+# rebuild this on centos5 (not found) - see kexcludes in build.common
 #
-# [marc]    deprecate with proper
-#
-util-python-MODULES := util-python
-util-python-SPEC := util-python.spec
-ALL += util-python
+local_inotify_tools=false
+ifeq "$(DISTRONAME)" "centos5"
+local_inotify_tools=true
+endif
+
+ifeq "$(local_inotify_tools)" "true"
+inotify-tools-MODULES := inotify-tools
+inotify-tools-SPEC := inotify-tools.spec
+inotify-tools-BUILD-FROM-SRPM := yes
+IN_BOOTSTRAPFS += inotify-tools
+ALL += inotify-tools
+endif
 
 #
 # vsys
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
-ifeq ($(DISTRO),"Fedora")
-ifeq ($(RELEASE),7)
-ALL += vsys
-endif
+ifeq "$(local_inotify_tools)" "true"
+vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel
 endif
+IN_BOOTSTRAPFS += vsys
+ALL += vsys
+
+#
+# vsys-scripts
+#
+vsys-scripts-MODULES := vsys-scripts
+vsys-scripts-SPEC := vsys-scripts.spec
+IN_BOOTSTRAPFS += vsys-scripts
+ALL += vsys-scripts
 
 #
 # PLCAPI
@@ -196,22 +217,64 @@ endif
 PLCAPI-MODULES := PLCAPI
 PLCAPI-SPEC := PLCAPI.spec
 ALL += PLCAPI
+IN_MYPLC += PLCAPI
+
+#
+# drupal
+# 
+drupal-MODULES := drupal
+drupal-SPEC := drupal.spec
+drupal-BUILD-FROM-SRPM := yes
+ALL += drupal
+IN_MYPLC += drupal
+
+#
+# use the plewww module instead
+#
+plewww-MODULES := PLEWWW
+plewww-SPEC := plewww.spec
+ALL += plewww
+IN_MYPLC += plewww
+
+#
+# www-register-wizard
+#
+www-register-wizard-MODULES := www-register-wizard
+www-register-wizard-SPEC := www-register-wizard.spec
+ALL += www-register-wizard
+IN_MYPLC += www-register-wizard
 
 #
-# PLCWWW
+# monitor
 #
-PLCWWW-MODULES := WWW
-PLCWWW-SPEC := PLCWWW.spec
-ALL += PLCWWW
+monitor-MODULES := Monitor
+monitor-SPEC := Monitor.spec
+ALL += monitor
+IN_BOOTSTRAPFS += monitor
+
+#
+# zabbix
+#
+zabbix-MODULES := Monitor
+zabbix-SPEC := zabbix.spec
+zabbix-BUILD-FROM-SRPM := yes
+ALL += zabbix
+
+#
+# nodeconfig
+#
+nodeconfig-MODULES := nodeconfig build
+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,32 +282,40 @@ ALL += bootmanager
 pypcilib-MODULES := pypcilib
 pypcilib-SPEC := pypcilib.spec
 ALL += pypcilib
-
-# copy the current list, so as to keep image-building rpms out
-ALL-REGULARS := $(ALL)
+IN_BOOTCD += pypcilib
 
 #
-# vserver : reference image for slices
+# pyplnet
 #
-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
-ALL += vserver
+pyplnet-MODULES := pyplnet
+pyplnet-SPEC := pyplnet.spec
+ALL += pyplnet
+IN_BOOTSTRAPFS += pyplnet
+IN_MYPLC += pyplnet
+IN_BOOTCD += pyplnet
 
 #
 # bootcd
 #
-bootcd-MODULES := BootCD BootManager build
+bootcd-MODULES := BootCD 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
+bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
+bootcd-DEPEND-FILES := RPMS/yumgroups.xml
+bootcd-RPMDATE := yes
 ALL += bootcd
+IN_MYPLC += bootcd
+
+#
+# vserver : reference image for slices
+#
+vserver-MODULES := VserverReference build
+vserver-SPEC := vserver-reference.spec
+vserver-DEPEND-PACKAGES := $(IN_VSERVER)
+vserver-DEPEND-FILES := RPMS/yumgroups.xml
+vserver-RPMDATE := yes
+ALL += vserver
+IN_BOOTSTRAPFS += vserver
 
 #
 # bootstrapfs
@@ -252,47 +323,61 @@ ALL += bootcd
 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
 
 #
-# myplc : initial, chroot-based packaging
+# noderepo
 #
-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-DEPENDS := $(filter-out vserver,$(ALL))
-myplc-DEPENDFILES := RPMS/yumgroups.xml
-ALL += myplc
+# 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))
 
-#
-# MyPLC native : lightweight packaging, dependencies are yum-installed in a vserver
-#
-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 : dunno about this one, let's stay safe
-myplc-native-DEPENDFILES := $(MyPLC-DEPENDFILES)
-#ALL += myplc-native
+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 development environment : chroot-based 
+# MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #
-myplc-devel-MODULES := MyPLC build 
-myplc-devel-SPEC := myplc-devel.spec
-myplc-devel-RPMBUILD := sudo bash ./rpmbuild.sh
-#ALL += myplc-devel
+myplc-MODULES := MyPLC build 
+myplc-SPEC := myplc.spec
+myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
+ALL += myplc
 
-#
-# MyPLC native development environment
-#
-myplc-devel-native-MODULES := MyPLC
-myplc-devel-native-SPEC := myplc-devel-native.spec
-#ALL += myplc-devel-native
+## #
+## # myplc-chroot : old-fashioned, chroot-based packaging
+## #
+## myplc-chroot-MODULES := MyPLC build
+## myplc-chroot-SPEC := myplc-chroot.spec
+## # myplc-chroot may require all packages
+## myplc-chroot-DEPEND-PACKAGES := $(IN_MYPLC)
+## myplc-chroot-DEPEND-FILES := RPMS/yumgroups.xml myplc-release
+## myplc-chroot-RPMDATE := yes
+## ALL += myplc-chroot
+
+# myplc-docs only contains docs for PLCAPI and NMAPI, but
+# we still need to pull MyPLC, as it is where the specfile lies, 
+# together with the utility script docbook2drupal.sh
+myplc-docs-MODULES := MyPLC PLCAPI NodeManager
+myplc-docs-SPEC := myplc-docs.spec
+ALL += myplc-docs
+
+# using some other name than myplc-release, as this is a make target already
+release-MODULES := MyPLC
+release-SPEC := myplc-release.spec
+release-RPMDATE := yes
+ALL += release