X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=52f8a282c2a28482d9bcc0a0306724bdd1ecdb84;hb=37eead6965cacb22305ae2407e91ea425cc373d0;hp=00494175f02d343822a8c8bdeb93b75e1e442788;hpb=9cba97686f019c60fddcc0ff2b45a79ba3083978;p=build.git diff --git a/planetlab.mk b/planetlab.mk index 00494175..52f8a282 100644 --- a/planetlab.mk +++ b/planetlab.mk @@ -1,30 +1,78 @@ # # PlanetLab standard components list -# +# initial version from Mark Huang # Mark Huang # Copyright (C) 2003-2006 The Trustees of Princeton University +# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis # # $Id$ # # see doc in Makefile # + # # kernel # -kernel-$(HOSTARCH)-MODULES := Linux-2.6 -kernel-$(HOSTARCH)-SPEC := scripts/kernel-2.6-planetlab.spec -ifeq ($(HOSTARCH),i386) -kernel-$(HOSTARCH)-RPMFLAGS:= --target i686 +# 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-$(HOSTARCH)-RPMFLAGS:= --target $(HOSTARCH) +kernel-RPMFLAGS:= --target $(HOSTARCH) endif +KERNELS += kernel -KERNELS += kernel-$(HOSTARCH) - -kernel: $(KERNELS) -kernel-clean: $(foreach package,$(KERNELS),$(package)-clean) +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 + +# +# 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 @@ -43,8 +91,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 @@ -52,13 +109,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 @@ -66,6 +125,7 @@ ALL += PingOfDeath NodeManager-MODULES := NodeManager NodeManager-SPEC := NodeManager.spec ALL += NodeManager +IN_BOOTSTRAPFS += NodeManager # # pl_sshd @@ -73,6 +133,7 @@ ALL += NodeManager pl_sshd-MODULES := pl_sshd pl_sshd-SPEC := pl_sshd.spec ALL += pl_sshd +IN_BOOTSTRAPFS += pl_sshd # # libhttpd++: @@ -80,19 +141,19 @@ ALL += pl_sshd # Deprecate when vsys takes over [sapan]. # keep in build for proper. # -libhttpd++-MODULES := libhttpd++ -libhttpd++-SPEC := libhttpd++.spec -ALL += libhttpd++ +libhttpd-MODULES := libhttpd++ +libhttpd-SPEC := libhttpd++.spec +ALL += libhttpd +IN_BOOTSTRAPFS += 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 +proper-DEPEND-DEVEL-RPMS := libhttpd++-devel ALL += proper +IN_BOOTSTRAPFS += proper # # codemux: Port 80 demux @@ -101,22 +162,32 @@ codemux-MODULES := CoDemux codemux-SPEC := codemux.spec codemux-RPMBUILD := sudo bash ./rpmbuild.sh ALL += codemux +IN_BOOTSTRAPFS += codemux # # 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 + +# +# fprobe-ulog +# +fprobe-ulog-MODULES := fprobe-ulog +fprobe-ulog-SPEC := fprobe-ulog.spec +ALL += fprobe-ulog +IN_BOOTSTRAPFS += fprobe-ulog # # netflow # netflow-MODULES := PlanetFlow netflow-SPEC := netflow.spec -netflow-SPECVARS = distroname=$(DISTRO) distrorelease=$(RELEASE) ALL += netflow +IN_BOOTSTRAPFS += netflow # # PlanetLab Mom: Cleans up your mess @@ -124,14 +195,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 := $(KERNELS) +iptables-DEPEND-DEVEL-RPMS := kernel-devel ALL += iptables +IN_BOOTSTRAPFS += iptables # # iproute @@ -139,23 +212,19 @@ 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-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 @@ -166,48 +235,65 @@ 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 + +# +# 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 - -# copy the current list, so as to keep image-building rpms out -ALL-REGULARS := $(ALL) +IN_MYPLC += bootmanager # -# vserver : reference image for slices -# -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 +# pypcilib : used in bootcd +# +pypcilib-MODULES := pypcilib +pypcilib-SPEC := pypcilib.spec +ALL += pypcilib +IN_BOOTCD += pypcilib # # 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 ALL += bootcd +IN_MYPLC += bootcd + +# +# vserver : reference image for slices +# +vserver-MODULES := VserverReference build +vserver-SPEC := vserver-reference.spec +# Package must be built as root +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 # # bootstrapfs @@ -216,9 +302,10 @@ 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 ALL += bootstrapfs +IN_MYPLC += bootstrapfs # # myplc : initial, chroot-based packaging @@ -228,8 +315,8 @@ 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 ALL += myplc # @@ -239,24 +326,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 -myplc-devel-native-SPECVARS = distroname=$(DISTRO) distrorelease=$(RELEASE) -#ALL += myplc-devel-native