X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=d592e29194cc11b0987c05417f656fd2ba94c7b9;hb=95a48481efe26b4c4385c29668c8c8c17ecc6ff1;hp=016b7b1885e3730b66241b7f103176a693f4c5e7;hpb=9fd98b5cef76e6824d83097e668f0d90500acf6f;p=build.git diff --git a/planetlab.mk b/planetlab.mk index 016b7b18..d592e291 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,8 +17,8 @@ # so the source rpm is created by running make srpm in the codebase # -kernel-MODULES := linux-patches -kernel-SPEC := kernel-2.6-planetlab.spec +kernel-MODULES := linux-2.6 +kernel-SPEC := kernel-2.6.spec kernel-BUILD-FROM-SRPM := yes ifeq "$(HOSTARCH)" "i386" kernel-RPMFLAGS:= --target i686 @@ -37,36 +38,10 @@ IN_BOOTSTRAPFS += $(KERNELS) # turns out myplc installs kernel-vserver IN_MYPLC += $(KERNELS) -# -# madwifi -# -# [thierry] - temporarily use onelab's svn -# -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) -IN_BOOTSTRAPFS += madwifi -ALL += 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 - -#################### tmp -ifeq "$(DISTRO)" "Fedora" -ifeq "$(RELEASE)" "4" # # 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 @@ -74,19 +49,19 @@ kexec-tools-TAG := planetlab-4_1-rc2 ALL += kexec-tools IN_BOOTCD += kexec-tools endif -endif -#################### tmp # -# 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 @@ -102,7 +77,7 @@ IN_BOOTSTRAPFS += util-vserver # 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 +util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core ALL += util-vserver-pl IN_BOOTSTRAPFS += util-vserver-pl @@ -138,26 +113,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 # @@ -167,15 +122,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 # @@ -185,12 +131,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 @@ -216,20 +161,30 @@ iproute-MODULES := iproute2 iproute-SPEC := iproute.spec ALL += iproute IN_BOOTSTRAPFS += iproute +IN_VSERVER += iproute +IN_BOOTCD += 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 @@ -242,11 +197,34 @@ 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 + +# +# monitor-server +# +monitor-server-MODULES := Monitor +monitor-server-SPEC := monitor-server.spec +ALL += monitor-server + +# +# nodeconfig +# +nodeconfig-MODULES := nodeconfig +nodeconfig-SPEC := nodeconfig.spec +ALL += nodeconfig +IN_MYPLC += nodeconfig + # # bootmanager # @@ -272,6 +250,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 @@ -286,8 +265,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 @@ -298,20 +278,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 @@ -326,3 +316,22 @@ 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 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