X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=1f1a978c25395d1e39f5bc1b306bb6ec582aa2ad;hb=15f737a0f4f29aa126d5bab87ee1936189b6f918;hp=97c8d6b87491922ebdecec469519a377c5f8f1d0;hpb=59f23a94a3a2c83cf46dd69c0181078614635476;p=build.git diff --git a/planetlab.mk b/planetlab.mk index 97c8d6b8..1f1a978c 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-MODULES := linux-patches -srpm-kernel-SPEC := kernel-2.6-planetlab.spec -ifeq ($(HOSTARCH),i386) -srpm-kernel-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-RPMFLAGS:= --target $(HOSTARCH) +kernel-RPMFLAGS:= --target $(HOSTARCH) endif -KERNELS += srpm-kernel - -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 # @@ -100,26 +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 -IN_BOOTSTRAPFS += libhttpd - -# -# proper: Privileged Operations Service -# -proper-MODULES := proper -proper-SPEC := proper.spec -proper-DEPEND-DEVEL-RPMS := libhttpd++-devel -ALL += proper -IN_BOOTSTRAPFS += proper - # # codemux: Port 80 demux # @@ -129,15 +133,6 @@ codemux-RPMBUILD := sudo bash ./rpmbuild.sh ALL += codemux IN_BOOTSTRAPFS += codemux -# -# ulogd -# -ulogd-MODULES := ulogd -ulogd-SPEC := ulogd.spec -ulogd-DEPEND-DEVEL-RPMS := kernel-devel proper-libs proper-devel -ALL += ulogd -IN_VSERVER += ulogd - # # fprobe-ulog # @@ -147,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 @@ -178,20 +172,29 @@ iproute-MODULES := iproute2 iproute-SPEC := iproute.spec ALL += iproute IN_BOOTSTRAPFS += iproute +IN_VSERVER += 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 @@ -204,18 +207,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 @@ -236,6 +253,7 @@ 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 +bootcd-RPMDATE := yes ALL += bootcd IN_MYPLC += bootcd @@ -250,8 +268,9 @@ vserver-RPMBUILD := sudo bash ./rpmbuild.sh # always redo all sequentially - try to keep updated vserver-DEPEND-PACKAGES := $(IN_VSERVER) vserver-DEPEND-FILES := RPMS/yumgroups.xml +vserver-RPMDATE := yes ALL += vserver -IN_BOOTSTRAPFS := vserver +IN_BOOTSTRAPFS += vserver # # bootstrapfs @@ -262,20 +281,30 @@ bootstrapfs-RPMBUILD := sudo bash ./rpmbuild.sh # package requires all regular packages 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-DEPEND-PACKAGES := $(IN_MYPLC) -myplc-DEPEND-FILES := 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 @@ -290,3 +319,19 @@ myplc-native-RPMBUILD := sudo bash ./rpmbuild.sh 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