X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=e132e3592014494c075a28a116e05d82d937cec3;hb=e6df4621f4a4f13fd1f5dfd95272e4b79bc1b676;hp=384fd2c6acf28f4d304ce4ff5832a9e961babbd7;hpb=038b13b8e990fbb1ee4359d4866475238a756fd3;p=build.git diff --git a/planetlab.mk b/planetlab.mk index 384fd2c6..e132e359 100644 --- a/planetlab.mk +++ b/planetlab.mk @@ -1,5 +1,5 @@ # -# PlanetLab standard components list +# declare the packages to be built and their dependencies # initial version from Mark Huang # Mark Huang # Copyright (C) 2003-2006 The Trustees of Princeton University @@ -38,18 +38,6 @@ 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 # @@ -72,22 +60,45 @@ util-vserver-RPMFLAGS:= --without dietlibc ALL += util-vserver IN_BOOTSTRAPFS += util-vserver +# +# libnl - local import +# we need either 1.1 or at least 1.0.pre6 +# rebuild this on centos5 - see kexcludes in build.common +# +local_libnl=false +ifeq "$(DISTRONAME)" "centos5" +local_libnl=true +endif + +ifeq "$(local_libnl)" "true" +libnl-MODULES := libnl +libnl-SPEC := libnl.spec +libnl-BUILD-FROM-SRPM := yes +# this sounds like the thing to do, but in fact linux/if_vlan.h comes with kernel-headers +libnl-DEPEND-DEVEL-RPMS := kernel-devel +ALL += libnl +IN_BOOTSTRAPFS += libnl +endif + # # util-vserver-pl # util-vserver-pl-MODULES := util-vserver-pl util-vserver-pl-SPEC := util-vserver-pl.spec -util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core +util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core +ifeq "$(local_libnl)" "true" +util-vserver-pl-DEPEND-DEVEL-RPMS += libnl libnl-devel +endif ALL += util-vserver-pl IN_BOOTSTRAPFS += util-vserver-pl # # NodeUpdate # -NodeUpdate-MODULES := NodeUpdate -NodeUpdate-SPEC := NodeUpdate.spec -ALL += NodeUpdate -IN_BOOTSTRAPFS += NodeUpdate +nodeupdate-MODULES := NodeUpdate +nodeupdate-SPEC := NodeUpdate.spec +ALL += nodeupdate +IN_BOOTSTRAPFS += nodeupdate # # ipod @@ -100,18 +111,18 @@ IN_BOOTSTRAPFS += ipod # # NodeManager # -NodeManager-MODULES := NodeManager -NodeManager-SPEC := NodeManager.spec -ALL += NodeManager -IN_BOOTSTRAPFS += NodeManager +nodemanager-MODULES := NodeManager +nodemanager-SPEC := NodeManager.spec +ALL += nodemanager +IN_BOOTSTRAPFS += nodemanager # # pl_sshd # -pl_sshd-MODULES := pl_sshd -pl_sshd-SPEC := pl_sshd.spec -ALL += pl_sshd -IN_BOOTSTRAPFS += pl_sshd +sshd-MODULES := pl_sshd +sshd-SPEC := pl_sshd.spec +ALL += sshd +IN_BOOTSTRAPFS += sshd # # codemux: Port 80 demux @@ -140,10 +151,10 @@ ALL += pf2slice # # PlanetLab Mom: Cleans up your mess # -pl_mom-MODULES := Mom -pl_mom-SPEC := pl_mom.spec -ALL += pl_mom -IN_BOOTSTRAPFS += pl_mom +mom-MODULES := Mom +mom-SPEC := pl_mom.spec +ALL += mom +IN_BOOTSTRAPFS += mom # # iptables @@ -165,26 +176,32 @@ IN_VSERVER += iproute IN_BOOTCD += iproute # -# vsys +# inotify-tools - local import +# rebuild this on centos5 (not found) - see kexcludes in build.common # -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 +local_inotify_tools=false ifeq "$(DISTRONAME)" "centos5" -vsys_support= +local_inotify_tools=true endif -ifeq "$(vsys_support)" "yes" +ifeq "$(local_inotify_tools)" "true" +inotify-tools-MODULES := inotify-tools +inotify-tools-SPEC := inotify-tools.spec +inotify-tools-BUILD-FROM-SRPM := yes +IN_BOOTSTRAPFS += inotify-tools +ALL += inotify-tools +endif + +# +# vsys +# vsys-MODULES := vsys vsys-SPEC := vsys.spec +ifeq "$(local_inotify_tools)" "true" +vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel +endif IN_BOOTSTRAPFS += vsys ALL += vsys -endif # # PLCAPI @@ -205,22 +222,23 @@ IN_MYPLC += PLCWWW # # monitor # -Monitor-MODULES := Monitor -Monitor-SPEC := Monitor.spec -ALL += Monitor -IN_BOOTSTRAPFS += Monitor +monitor-MODULES := Monitor +monitor-SPEC := Monitor.spec +ALL += monitor +IN_BOOTSTRAPFS += monitor # -# monitor-server +# zabbix # -monitor-server-MODULES := Monitor -monitor-server-SPEC := monitor-server.spec -ALL += monitor-server +zabbix-MODULES := Monitor +zabbix-SPEC := zabbix.spec +zabbix-BUILD-FROM-SRPM := yes +ALL += zabbix # # nodeconfig # -nodeconfig-MODULES := nodeconfig +nodeconfig-MODULES := nodeconfig build nodeconfig-SPEC := nodeconfig.spec ALL += nodeconfig IN_MYPLC += nodeconfig @@ -247,7 +265,6 @@ IN_BOOTCD += pypcilib bootcd-MODULES := BootCD build bootcd-SPEC := bootcd.spec 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 @@ -261,8 +278,6 @@ 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 vserver-RPMDATE := yes @@ -275,7 +290,6 @@ IN_BOOTSTRAPFS += vserver bootstrapfs-MODULES := BootstrapFS build bootstrapfs-SPEC := bootstrapfs.spec 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 @@ -332,3 +346,9 @@ ALL += myplc-native myplc-docs-MODULES := MyPLC PLCAPI NodeManager myplc-docs-SPEC := myplc-docs.spec ALL += myplc-docs + +# using some other name than myplc-release, as this is a make target already +release-MODULES := MyPLC +release-SPEC := myplc-release.spec +release-RPMDATE := yes +ALL += release