+++ /dev/null
-# build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
-
-# trying the 2.6.27 kernel
-# VINI is running a prototype of a 2.6.27-based PlanetLab node (aka Trellis)
-# Below we include a few Trellis versions of packages
-linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/trunk
-madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-3878-0
-# Trellis is using a modified util-vserver and util-vserver-pl with the 2.6.27 kernel
-util-vserver-BRANCH := trellis
-util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/branches/trellis
-libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
-util-vserver-pl-BRANCH := trellis
-util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/branches/trellis
-NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/nodeupdate-0.5-9
-PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-23
-# Trellis-specific NodeManager plugins
-NodeManager-topo-SVNPATH := http://svn.planet-lab.org/svn/NodeManager-topo/trunk
-NodeManager-optin-SVNPATH := http://svn.planet-lab.org/svn/NodeManager-optin/trunk
-pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet/tags/pyplnet-4.3-9
-pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
-CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/tags/codemux-0.1-15
-fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
-pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
-Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4
-iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/trunk
-iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
-inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
-vsys-BRANCH := 0.9
-vsys-GITPATH := git://git.onelab.eu/vsys@vsys-0.9-4
-vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-24
-PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-33
-drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-PLEWWW-GITPATH := git://git.onelab.eu/plewww@plewww-4.3-65
-www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
-Monitor-SVNPATH := http://svn.planet-lab.org/svn//Monitor/tags/Monitor-3.0-30/
-pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-4/
-nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.3-7
-BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-4.3-13
-pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-10
-BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/bootcd-4.2-18
-VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-16
-BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-11
-MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-37
-sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-14
-pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
-PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-10
-
-# locating the right test directory - see make tests_gitpath
-tests-GITPATH := git://git.onelab.eu/tests.git@tests-4.3-6
+++ /dev/null
-# $Id$
-# $URL$
-#
-# declare the packages to be built and their dependencies
-# initial version from Mark Huang
-# Mark Huang <mlhuang@cs.princeton.edu>
-# Copyright (C) 2003-2006 The Trustees of Princeton University
-# rewritten by Thierry Parmentelat - INRIA Sophia Antipolis
-#
-# see doc in Makefile
-#
-
-#
-# kernel
-#
-# use a package name with srpm in it:
-# so the source rpm is created by running make srpm in the codebase
-#
-
-kernel-MODULES := linux-2.6
-kernel-SPEC := kernel-2.6.spec
-kernel-BUILD-FROM-SRPM := yes
-ifeq "$(HOSTARCH)" "i386"
-kernel-RPMFLAGS:= --target i686
-else
-kernel-RPMFLAGS:= --target $(HOSTARCH)
-endif
-KERNELS += kernel
-
-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)
-
-#
-# 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
-
-#
-# util-vserver
-#
-util-vserver-MODULES := util-vserver
-util-vserver-SPEC := util-vserver.spec
-#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 kernel-headers
-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
-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
-
-#
-# ipod
-#
-ipod-MODULES := PingOfDeath
-ipod-SPEC := ipod.spec
-ALL += ipod
-IN_BOOTSTRAPFS += ipod
-
-#
-# NodeManager
-#
-nodemanager-MODULES := NodeManager
-nodemanager-SPEC := NodeManager.spec
-ALL += nodemanager
-IN_BOOTSTRAPFS += nodemanager
-
-#
-# pl_sshd
-#
-sshd-MODULES := pl_sshd
-sshd-SPEC := pl_sshd.spec
-ALL += sshd
-IN_BOOTSTRAPFS += sshd
-
-#
-# codemux: Port 80 demux
-#
-codemux-MODULES := CoDemux
-codemux-SPEC := codemux.spec
-ALL += codemux
-IN_BOOTSTRAPFS += codemux
-
-#
-# fprobe-ulog
-#
-fprobe-ulog-MODULES := fprobe-ulog
-fprobe-ulog-SPEC := fprobe-ulog.spec
-ALL += fprobe-ulog
-IN_BOOTSTRAPFS += fprobe-ulog
-
-#
-# pf2slice
-#
-pf2slice-MODULES := pf2slice
-pf2slice-SPEC := pf2slice.spec
-ALL += pf2slice
-
-#
-# PlanetLab Mom: Cleans up your mess
-#
-mom-MODULES := Mom
-mom-SPEC := pl_mom.spec
-ALL += mom
-IN_BOOTSTRAPFS += mom
-
-#
-# iptables
-#
-iptables-MODULES := iptables
-iptables-SPEC := iptables.spec
-iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
-ALL += iptables
-IN_BOOTSTRAPFS += iptables
-
-#
-# iproute
-#
-iproute-MODULES := iproute2
-iproute-SPEC := iproute.spec
-ALL += iproute
-IN_BOOTSTRAPFS += iproute
-IN_VSERVER += iproute
-IN_BOOTCD += iproute
-
-#
-# inotify-tools - local import
-# rebuild this on centos5 (not found) - see kexcludes in build.common
-#
-local_inotify_tools=false
-ifeq "$(DISTRONAME)" "centos5"
-local_inotify_tools=true
-endif
-
-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
-
-#
-# vsys-scripts
-#
-vsys-scripts-MODULES := vsys-scripts
-vsys-scripts-SPEC := vsys-scripts.spec
-IN_BOOTSTRAPFS += vsys-scripts
-ALL += vsys-scripts
-
-#
-# PLCAPI
-#
-PLCAPI-MODULES := PLCAPI
-PLCAPI-SPEC := PLCAPI.spec
-ALL += PLCAPI
-IN_MYPLC += PLCAPI
-
-#
-# drupal
-#
-drupal-MODULES := drupal
-drupal-SPEC := drupal.spec
-drupal-BUILD-FROM-SRPM := yes
-ALL += drupal
-IN_MYPLC += drupal
-
-#
-# use the plewww module instead
-#
-plewww-MODULES := PLEWWW
-plewww-SPEC := plewww.spec
-ALL += plewww
-IN_MYPLC += plewww
-
-#
-# www-register-wizard
-#
-www-register-wizard-MODULES := www-register-wizard
-www-register-wizard-SPEC := www-register-wizard.spec
-ALL += www-register-wizard
-IN_MYPLC += www-register-wizard
-
-#
-# pcucontrol
-#
-pcucontrol-MODULES := pcucontrol
-pcucontrol-SPEC := pcucontrol.spec
-ALL += pcucontrol
-
-#
-# monitor
-#
-monitor-MODULES := Monitor
-monitor-SPEC := Monitor.spec
-ALL += monitor
-IN_BOOTSTRAPFS += monitor
-
-#
-# PLC RT
-#
-plcrt-MODULES := PLCRT
-plcrt-SPEC := plcrt.spec
-ALL += plcrt
-
-#
-# zabbix
-#
-zabbix-MODULES := Monitor
-zabbix-SPEC := zabbix.spec
-zabbix-BUILD-FROM-SRPM := yes
-ALL += zabbix
-
-#
-# pyopenssl
-#
-pyopenssl-MODULES := pyopenssl
-pyopenssl-SPEC := pyOpenSSL.spec
-pyopenssl-BUILD-FROM-SRPM := yes
-ALL += pyopenssl
-
-
-#
-# sfa - Slice Facility Architecture
-#
-sfa-MODULES := sfa
-sfa-SPEC := sfa.spec
-ALL += sfa
-
-#
-# nodeconfig
-#
-nodeconfig-MODULES := nodeconfig build
-nodeconfig-SPEC := nodeconfig.spec
-ALL += nodeconfig
-IN_MYPLC += nodeconfig
-
-#
-# bootmanager
-#
-bootmanager-MODULES := BootManager
-bootmanager-SPEC := bootmanager.spec
-ALL += bootmanager
-IN_MYPLC += bootmanager
-
-#
-# pypcilib : used in bootcd
-#
-pypcilib-MODULES := pypcilib
-pypcilib-SPEC := pypcilib.spec
-ALL += pypcilib
-IN_BOOTCD += pypcilib
-
-#
-# pyplnet
-#
-pyplnet-MODULES := pyplnet
-pyplnet-SPEC := pyplnet.spec
-ALL += pyplnet
-IN_BOOTSTRAPFS += pyplnet
-IN_MYPLC += pyplnet
-IN_BOOTCD += pyplnet
-
-#
-# bootcd
-#
-bootcd-MODULES := BootCD build
-bootcd-SPEC := bootcd.spec
-bootcd-DEPEND-PACKAGES := $(IN_BOOTCD)
-bootcd-DEPEND-FILES := RPMS/yumgroups.xml
-bootcd-RPMDATE := yes
-ALL += bootcd
-IN_MYPLC += bootcd
-
-#
-# vserver : reference image for slices
-#
-vserver-MODULES := VserverReference build
-vserver-SPEC := vserver-reference.spec
-vserver-DEPEND-PACKAGES := $(IN_VSERVER)
-vserver-DEPEND-FILES := RPMS/yumgroups.xml
-vserver-RPMDATE := yes
-ALL += vserver
-IN_BOOTSTRAPFS += vserver
-
-#
-# bootstrapfs
-#
-bootstrapfs-MODULES := BootstrapFS build
-bootstrapfs-SPEC := bootstrapfs.spec
-bootstrapfs-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS)
-bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
-bootstrapfs-RPMDATE := yes
-ALL += bootstrapfs
-IN_MYPLC += bootstrapfs
-
-#
-# noderepo
-#
-# 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
-# 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 : lightweight packaging, dependencies are yum-installed in a vserver
-#
-myplc-MODULES := MyPLC build
-myplc-SPEC := myplc.spec
-myplc-DEPEND-FILES := myplc-release RPMS/yumgroups.xml
-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 Monitor
-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
-
git://git.onelab.eu / build.git / commitdiff