#
# 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$
#
# 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-patches
+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)
-
-kernel: $(KERNELS)
-kernel-clean: $(foreach package,$(KERNELS),$(package)-clean)
+KERNELS += kernel
-# the first kernel package defined here for convenience
-kernel_package := $(word 1,$(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
# 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
+
+#
+# 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
+
+#
+# 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
#
util-vserver-MODULES := util-vserver
util-vserver-SPEC := util-vserver.spec
util-vserver-RPMFLAGS:= --without dietlibc
-util-vserver-DEPENDDEVELS := 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
#
libhttpd-MODULES := libhttpd++
libhttpd-SPEC := libhttpd++.spec
ALL += libhttpd
+IN_BOOTSTRAPFS += libhttpd
#
# proper: Privileged Operations Service
#
proper-MODULES := proper
proper-SPEC := proper.spec
-proper-DEPENDDEVELS := libhttpd
+proper-DEPEND-DEVEL-RPMS := libhttpd++-devel
ALL += proper
+IN_BOOTSTRAPFS += proper
#
# codemux: Port 80 demux
#
ulogd-MODULES := ulogd
ulogd-SPEC := ulogd.spec
-ulogd-DEPENDDEVELS := $(kernel_package)
-ulogd-DEPENDDEVELRPMS := proper-libs proper-devel
+ulogd-DEPEND-DEVEL-RPMS := kernel-devel proper-libs proper-devel
ALL += ulogd
IN_VSERVER += ulogd
ALL += fprobe-ulog
IN_BOOTSTRAPFS += fprobe-ulog
+#
+# pf2slice
+#
+pf2slice-MODULES := pf2slice
+pf2slice-SPEC := pf2slice.spec
+ALL += pf2slice
+
+
#
# netflow
#
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
-iptables-DEPENDDEVELS := $(kernel_package)
+iptables-DEPEND-DEVEL-RPMS := kernel-devel
ALL += iptables
IN_BOOTSTRAPFS += iptables
#
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)
+ifeq "$(RELEASE)" "8"
ALL += vsys
endif
endif
#
# PLCWWW
#
-PLCWWW-MODULES := WWW
+PLCWWW-MODULES := PLCWWW
PLCWWW-SPEC := PLCWWW.spec
ALL += PLCWWW
IN_MYPLC += PLCWWW
+#
+# 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
bootcd-SPEC := bootcd.spec
bootcd-RPMBUILD := sudo bash ./rpmbuild.sh
# package has *some* dependencies, at least these ones
-bootcd-DEPENDS := $(IN_BOOTCD)
-bootcd-DEPENDFILES := RPMS/yumgroups.xml
+bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
+bootcd-DEPEND-FILES := RPMS/yumgroups.xml
ALL += bootcd
IN_MYPLC += bootcd
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-DEPENDS := $(IN_VSERVER)
-vserver-DEPENDFILES := RPMS/yumgroups.xml
+vserver-DEPEND-PACKAGES := $(IN_VSERVER)
+vserver-DEPEND-FILES := RPMS/yumgroups.xml
ALL += vserver
-IN_BOOTSTRAPFS := vserver
+IN_BOOTSTRAPFS += vserver
#
# bootstrapfs
bootstrapfs-SPEC := bootstrapfs.spec
bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh
# package requires all regular packages
-bootstrapfs-DEPENDS := $(IN_BOOTSTRAPFS)
-bootstrapfs-DEPENDFILES := RPMS/yumgroups.xml
+bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
+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
#
# Package must be built as root
myplc-RPMBUILD := sudo bash ./rpmbuild.sh
# myplc may require all packages
-myplc-DEPENDS := $(IN_MYPLC)
-myplc-DEPENDFILES := RPMS/yumgroups.xml myplc-release
+myplc-DEPEND-PACKAGES := $(IN_MYPLC)
+myplc-DEPEND-FILES := RPMS/yumgroups.xml myplc-release
ALL += myplc
#
# Package must be built as root
myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh
# Thierry : don't depend on anything at build-time
-#myplc-native-DEPENDS :=
+#myplc-native-DEPEND-PACKAGES :=
# Thierry : dunno about this one, let's stay safe
-myplc-native-DEPENDFILES := $(myplc-DEPENDFILES)
+myplc-native-DEPEND-FILES := myplc-release
ALL += myplc-native