X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=00119bfa0bb6a05af4f9d111e6bef1bc22f89cd0;hb=cb0c921da4fce8d28d18a7e828913b590ae464d7;hp=78917be60f319a089bd768284bca692b45a60629;hpb=b9b1dfdb163a57e440a0c9d74c85cf5d492fa74d;p=build.git diff --git a/planetlab.mk b/planetlab.mk index 78917be6..00119bfa 100644 --- a/planetlab.mk +++ b/planetlab.mk @@ -1,8 +1,9 @@ # # 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$ # @@ -16,20 +17,18 @@ # 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) - -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 @@ -39,6 +38,31 @@ 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 + +# +# 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 + # # libnl # @@ -56,17 +80,15 @@ ALL += 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 +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-DEPENDDEVELS := libnl -util-vserver-pl-DEPENDDEVELRPMS := util-vserver-lib util-vserver-devel +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 @@ -102,24 +124,6 @@ pl_sshd-SPEC := pl_sshd.spec ALL += pl_sshd IN_BOOTSTRAPFS += pl_sshd -# -# libhttpd++: -# -# Deprecate when vsys takes over [sapan]. -# keep in build for proper. -# -libhttpd-MODULES := libhttpd++ -libhttpd-SPEC := libhttpd++.spec -ALL += libhttpd - -# -# proper: Privileged Operations Service -# -proper-MODULES := proper -proper-SPEC := proper.spec -proper-DEPENDDEVELS := libhttpd -ALL += proper - # # codemux: Port 80 demux # @@ -129,16 +133,6 @@ codemux-RPMBUILD := sudo bash ./rpmbuild.sh ALL += codemux IN_BOOTSTRAPFS += codemux -# -# ulogd -# -ulogd-MODULES := ulogd -ulogd-SPEC := ulogd.spec -ulogd-DEPENDDEVELS := $(kernel_package) -ulogd-DEPENDDEVELRPMS := proper-libs proper-devel -ALL += ulogd -IN_VSERVER += ulogd - # # fprobe-ulog # @@ -148,12 +142,11 @@ ALL += fprobe-ulog IN_BOOTSTRAPFS += fprobe-ulog # -# netflow +# pf2slice # -netflow-MODULES := PlanetFlow -netflow-SPEC := netflow.spec -ALL += netflow -IN_BOOTSTRAPFS += netflow +pf2slice-MODULES := pf2slice +pf2slice-SPEC := pf2slice.spec +ALL += pf2slice # # PlanetLab Mom: Cleans up your mess @@ -168,7 +161,7 @@ IN_BOOTSTRAPFS += pl_mom # iptables-MODULES := iptables iptables-SPEC := iptables.spec -iptables-DEPENDDEVELS := $(kernel_package) +iptables-DEPEND-DEVEL-RPMS := kernel-devel ALL += iptables IN_BOOTSTRAPFS += iptables @@ -183,16 +176,24 @@ IN_BOOTSTRAPFS += iproute # # 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 -ifeq ($(RELEASE),8) -ALL += vsys -endif -endif # # PLCAPI @@ -205,18 +206,32 @@ IN_MYPLC += PLCAPI # # PLCWWW # -PLCWWW-MODULES := WWW +PLCWWW-MODULES := PLCWWW PLCWWW-SPEC := PLCWWW.spec ALL += PLCWWW IN_MYPLC += PLCWWW +# +# monitor +# +Monitor-MODULES := Monitor +Monitor-SPEC := Monitor.spec +ALL += Monitor +IN_BOOTSTRAPFS += Monitor + +# +# 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 @@ -235,8 +250,9 @@ bootcd-MODULES := BootCD build 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 +bootcd-RPMDATE := yes ALL += bootcd IN_MYPLC += bootcd @@ -249,10 +265,11 @@ vserver-SPEC := vserver-reference.spec 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 +vserver-RPMDATE := yes ALL += vserver -IN_BOOTSTRAPFS := vserver +IN_BOOTSTRAPFS += vserver # # bootstrapfs @@ -261,22 +278,32 @@ bootstrapfs-MODULES := BootstrapFS build 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 +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 := $(IN_MYPLC) -myplc-DEPENDFILES := RPMS/yumgroups.xml myplc-release -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)) + +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 native : lightweight packaging, dependencies are yum-installed in a vserver @@ -286,8 +313,24 @@ 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-DEPENDS := +#myplc-native-DEPEND-PACKAGES := # Thierry : dunno about this one, let's stay safe -myplc-native-DEPENDFILES := myplc-release +myplc-native-DEPEND-FILES := myplc-release ALL += myplc-native +## # +## # myplc : old-fashioned, chroot-based packaging +## # +## 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 +## myplc-RPMDATE := yes +## ALL += myplc + +myplc-docs-MODULES := MyPLC PLCAPI NodeManager +myplc-docs-SPEC := myplc-docs.spec +ALL += myplc-docs