### this utility allows to extract various info from a spec file
### and to define them in makefiles
+# use the C code where it works as it's the original one, use the python code otherwise
spec2make: spec2make.c
- $(CC) -g -Wall $< -o $@ -lrpm -lrpmbuild -lrpmio -lpopt
+ $(CC) -g -Wall $< -o $@ -lrpm -lrpmbuild -lrpmio -lpopt || ln -s spec2make.py $@
### run spec2make on the spec file and include the result
# usage: spec2make package
function pl_getKexcludes () {
distroname=$1; shift
case $distroname in
- ### there is an ugly hack going on around here
- # with f12, the dependencies somehow require kernel 2.6.29 but our own kernel is 2.6.27
- # so the ugly workaround here is to let 'kernel-debug' get installed from the stock repos
- # we then remove it manually after the image is done, look for kernel-debug below
- # relyong on kernel-PAE for this trick won't work, as 64 bits distros don't have PAE of course
+ ### assuming all distros run at least 2.6.32
f*)
- echo 'kernel kernel-PAE kernel-PAEdebug kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iptables-ipv6 iproute drupal' ;;
+ echo 'kernel* util-vserver* iptables iptables-ipv6 iproute drupal' ;;
centos5)
echo 'kernel kernel-vserver kernel-devel kernel-headers kernel-debuginfo util-vserver* iptables iproute drupal inotify-tools* libnl' ;;
sl*)
mkinitrd-GITPATH := git://git.verivue.com/planetlab/mkinitrd.git@mkinitrd-5.1.19.6-4
linux-2.6-BRANCH := rhel6
linux-2.6-GITPATH := git://git.verivue.com/planetlab/linux-2.6.git@linux-2.6-32-16
-util-vserver-GITPATH := git://git.verivue.com/planetlab/util-vserver.git@util-vserver-0.30.216-16
+util-vserver-GITPATH := git://git.verivue.com/planetlab/util-vserver.git@util-vserver-0.30.216-17
util-vserver-BUILD-FROM-SRPM := yes # tmp
-util-vserver-pl-GITPATH := git://git.verivue.com/planetlab/util-vserver-pl.git@util-vserver-pl-0.4-25
+util-vserver-pl-GITPATH := git://git.verivue.com/planetlab/util-vserver-pl.git@util-vserver-pl-0.4-26
libnl-GITPATH := git://git.verivue.com/planetlab/libnl.git@libnl-1.1-2
-nodeupdate-GITPATH := git://git.verivue.com/planetlab/nodeupdate.git@nodeupdate-0.5-8
+nodeupdate-GITPATH := git://git.verivue.com/planetlab/nodeupdate.git@nodeupdate-0.5-9
nodemanager-GITPATH := git://git.verivue.com/planetlab/nodemanager@nodemanager-1.8-38
pyplnet-GITPATH := git://git.verivue.com/planetlab/pyplnet@pyplnet-4.3-14
codemux-GITPATH := git://git.verivue.com/planetlab/codemux.git@CoDemux-0.1-13
iproute2-GITPATH := git://git.verivue.com/planetlab/iproute2.git@iproute2-2.6.35-0
inotify-tools-GITPATH := git://git.verivue.com/planetlab/inotify-tools.git@inotify-tools-3.13-2
vsys-GITPATH := git://git.verivue.com/planetlab/vsys.git@vsys-0.99-1
-vsys-scripts-GITPATH := git://git.verivue.com/planetlab/vsys-scripts.git@vsys-scripts-0.95-28
+vsys-scripts-GITPATH := git://git.verivue.com/planetlab/vsys-scripts.git@vsys-scripts-0.95-29
plcapi-GITPATH := git://git.verivue.com/planetlab/plcapi@plcapi-4.3-38
drupal-GITPATH := git://git.verivue.com/planetlab/drupal.git@drupal-4.7-14
plewww-GITPATH := git://git.verivue.com/planetlab/plewww@PLEWWW-4.3-53
CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-13
fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-1
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-3
+Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4
iptables-BRANCH := 1.3.8
iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-9
iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-2
+++ /dev/null
-# $Id$
-# $URL$
-#
-# Keeping the old name as it might be referenced elsewhere (node update..)
-# groupname: Bootstrapfs
-groupname: PlanetLab
-groupdesc: PlanetLab Node Root
-# packages to exclude from stock repositories
-kexclude: @KEXCLUDE@
-# fedora-release or centos-release are pulled from deps
-# define packages
-package: kernel
-package: udev
-package: basesystem
-package: filesystem
-package: bash
-package: coreutils
-package: python
-package: cpio
-package: e2fsprogs
-package: ed
-package: file
-package: glibc
-package: hdparm
-package: initscripts
-package: iproute
-package: iputils
-package: kbd
-package: passwd
-package: procps
-package: readline
-package: rootfiles
-package: rpm
-package: setserial
-package: setup
-package: vim-minimal
-package: shadow-utils
-package: anacron
-package: at
-package: authconfig
-package: bc
-package: bind-utils
-package: bzip2
-package: crontabs
-package: dhclient
-package: diffutils
-package: ethtool
-package: logrotate
-package: libnl
-package: lsof
-package: mailcap
-package: nano
-package: nc
-package: openssh-clients
-package: parted
-package: pciutils
-package: psacct
-package: quota
-package: rsh
-package: rsync
-package: sendmail
-package: sudo
-package: telnet
-package: traceroute
-package: time
-package: tmpwatch
-package: tcpdump
-package: openssh-server
-package: wget
-package: yum
-package: curl
-package: gzip
-package: iptables
-package: mkinitrd
-package: ntp
-package: perl
-package: python
-package: tar
-package: expect
-package: nfs-utils
-package: openvpn
-package: vconfig
-package: PyXML
-
-
-#
-# platform-dependent
-#
-package>=f8: rsyslog
-package>=centos5: sysklogd
-
-package>=f8: util-linux-ng
-package>=centos5: util-linux
-
-package<=f8 package<=centos5: termcap libtermcap vixie-cron
-#
-# planetlab
-#
-package: madwifi
-package: wireless-tools
-package: util-vserver
-package: util-vserver-build
-package: util-vserver-lib
-package: util-vserver-core
-package: util-vserver-sysv
-package: util-vserver-legacy
-package: util-vserver-pl
-#package: util-python
-package: NodeManager
-package: NodeUpdate
-package: codemux
-package: pl_sshd
-package: ipod
-package: vserver-@pldistro@-@fcdistro@-@arch@
-package: vserver-systemslices-@pldistro@-@fcdistro@-@arch@
-package: pl_mom
-package: fprobe-ulog
-package: vsys
-package: vsys-scripts
-package: monitor-client
-package: monitor-runlevelagent
+++ /dev/null
-#!/bin/bash
-
-vdir=$1
-if [ -z "${vdir}" ] ; then
- echo "ERROR: $0"
- echo "Provide the directory of the root filesystem to operate on"
- exit
-fi
-
-# Cleanup yum config entirely, waiting for the config files to populate this
-rm -rf ${vdir}/etc/yum.conf ${vdir}/etc/yum.repos.d
-
-# NOTE: we're enabling util-vserver to allow it to help shutdown all slices
-# before rebooting. This has been problematic in the past.
-# Thierry : I'm enabling network since, for some reason, it ends up turned off on fedora9
-for service in network util-vserver; do
- chroot ${vdir} /sbin/chkconfig $service on
-done
-
-# Remove unneeded services
-for service in vprocunhide vservers-default; do
- chroot ${vdir} /sbin/chkconfig $service off
-done
-
-# Disable splaying of cron.
-echo > ${vdir}/etc/sysconfig/crontab
-
-# Add site_admin account
-chroot ${vdir} /usr/sbin/useradd -p "" -u 502 -m site_admin
+++ /dev/null
-# define here the ordered set of mirrors that you'd like to use when running mkfedora
-# used to be hard-wired in build.common / mkfedora
-# see http://svn.planet-lab.org/wiki/VserverCentos for howto setup local mirroring
-mirror: http://build.planet-lab.org/
+++ /dev/null
-groupname: PlanetFlowReference
-groupdesc: PlanetFlow Reference Image
-# add in all rpms we need such that the ap vserver will have all of
-# the necessary software to bring up wireless without ever needing
-# to contact MyPLC
package: tetex-latex
package: gcc-c++
package: binutils-devel
+# required for perf
+package: xmlto asciidoc newt-devel
+package: perl-ExtUtils-Embed
# iptables
package: linuxdoc-tools
package: sudo
-# don't bother to upgrade
-linux-2.6-BRANCH := f12
-linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6.32-f12
-kernel-DEVEL-RPMS += elfutils-libelf-devel
-kernel-DEVEL-RPMS += e2fsprogs
-kernel-DEVEL-RPMS += xmlto
-kernel-DEVEL-RPMS += asciidoc
+### # don't bother to upgrade
+### linux-2.6-BRANCH := f12
+### linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6.32-f12
+### kernel-DEVEL-RPMS += elfutils-libelf-devel
+### kernel-DEVEL-RPMS += e2fsprogs
+### kernel-DEVEL-RPMS += xmlto
+### kernel-DEVEL-RPMS += asciidoc
#util-vserver-BRANCH := f12
#util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@f12-bbox-f14
-util-vserver-GITPATH := git://git.planet-lab.eu/util-vserver.git@util-vserver-0.30.216-15
+util-vserver-GITPATH := git://git.planet-lab.eu/util-vserver.git@util-vserver-0.30.216-17
util-vserver-DEVEL-RPMS += nss nss-devel
util-vserver-DEVEL-RPMS += dietlibc
# but use latest stuff for f12 that has 3.2.28
yum-BRANCH := f12
-yum-GITPATH := git://git.onelab.eu/yum.git@3.2.28-5-f1x
+yum-GITPATH := git://git.onelab.eu/yum.git@3.2.28-99-f1x
yum-DEVEL-RPMS += gettext
yum-DEVEL-RPMS += intltool
endif
# the defaults below are built into the specfile
#kernel-RPMFLAGS += --with firmware --without doc --without-debug
-ALL += kernel
+# do not rebuild on f14, as this crashes, use the one built on f12 instead (go figure)
+###ALL += kernel
#
# util-vserver
--- /dev/null
+#!/bin/bash
+echo "Running latex and pdflatex on a dummy input"
+cd /tmp
+cat > latex-dummy.tex <<EOF
+\\documentclass{article}
+\\begin{document}
+a dummy text to make sure latex is properly configured, as we're seeing weird error messages like
+I can't find the format file pdflatex.fmt!
+\\end{document}
+EOF
+latex latex-dummy < /dev/null >& /dev/null
+pdflatex latex-dummy < /dev/null >& /dev/null
+exit 0
--- /dev/null
+[fedora]
+name=Fedora 15 - $basearch
+baseurl=@MIRRORURL@/fedora/releases/15/Everything/$basearch/os/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-15-primary
+
+[updates]
+name=Fedora 15 - $basearch - Updates
+baseurl=@MIRRORURL@/fedora/updates/15/$basearch/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://mirror.onelab.eu/keys/RPM-GPG-KEY-fedora-15-primary
+
default_url="http://localhost/mirror/"
default_distro="f8"
-all_distros="f8 f10 f12 f14 centos5"
+all_distros="f8 f10 f12 f14 f15 centos5"
function check_distro () {
local distro=$1; shift
if not build.is_clean():
build.revert()
- tagsfiles=glob(build.path+"/*-tags*.mk")
+ tagsfiles=glob(build.path+"/*-tags.mk")
tagsdict=dict( [ (x,'todo') for x in tagsfiles ] )
default_answer = 'y'
tagsfiles.sort()
'version' : "check latest specfile and print out details",
'diff' : "show difference between module (trunk or branch) and latest tag",
'tag' : """increment taglevel in specfile, insert changelog in specfile,
- create new tag and and monitor its adoption in build/*-tags*.mk""",
+ create new tag and and monitor its adoption in build/*-tags.mk""",
'branch' : """create a branch for this module, from the latest tag on the trunk,
and change trunk's version number to reflect the new branch name;
you can specify the new branch name by using module:branch""",
linux-2.6:22
linux-2.6:rhel6
madwifi
-madwifi:0.9.4
mkinitrd
Mom
-Monitor
+monitor
myplc
nodeconfig
nodemanager
+NodeManager-topo
nodeupdate
-nozomi
omf
oml
openvswitch
make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-tags.mk DISTRONAME=${fcdistro} module-tools ;
make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-k27-tags.mk DISTRONAME=${fcdistro} module-tools ;
make stage1=true PLDISTRO=planetlab PLDISTROTAGS=planetlab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ;
- make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k22-tags.mk DISTRONAME=${fcdistro} module-tools ;
make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k27-tags.mk DISTRONAME=${fcdistro} module-tools ;
make stage1=true PLDISTRO=onelab PLDISTROTAGS=onelab-k32-tags.mk DISTRONAME=${fcdistro} module-tools ;
done 2>/dev/null ;
--- /dev/null
+#!/usr/bin/env python3.2
+#
+# perform comparison of tags contents between planet-lab and onelab tags
+#
+
+import sys
+import re
+from argparse import ArgumentParser
+import subprocess
+
+class TagsFile:
+
+ def __init__ (self, filename):
+ self.filename=filename
+
+ m_comment = re.compile('^\s*#')
+ m_empty = re.compile('^\s*$')
+ m_gitpath = re.compile(\
+ '^\s*(?P<module>[\w\.\-]+)-GITPATH\s*'+
+ ':=\s*git://(?P<host>[\w\.\-]+)/'+
+ '(?P<repo>[\w\.\-]+)(?P<tag>[@\w/:_\.\-]+)?\s*$')
+ m_svnpath = re.compile(\
+ '^\s*(?P<module>[\w\-]+)-SVNPATH\s*'+
+ ':=\s*http://(?P<host>[\w\.\-]+)/'+
+ '(?P<svnpath>[\w/:_\.\-]+)\s*$')
+ m_branch = re.compile(\
+ '^\s*(?P<module>[\w\.\-]+)-BRANCH\s*:=\s*(?P<branch>[\w]+)\s*$')
+
+ def _parse (self,o):
+ self.git={}
+ self.svn={}
+ self.branch={}
+ with open(self.filename) as i:
+ for line in i.readlines():
+ line=line.strip()
+ match=TagsFile.m_empty.match(line)
+ if match: continue
+ match=TagsFile.m_comment.match(line)
+ if match: continue
+ match=TagsFile.m_gitpath.match(line)
+ if match:
+ (module,host,repo,tag)=match.groups()
+ if tag: tag=tag.replace('@','')
+ if module in self.git: print ('Warning: duplicate GITPATH for',module,file=o)
+ self.git[module]=tag
+ continue
+ match=TagsFile.m_svnpath.match(line)
+ if match:
+ (module,host,svnpath)=match.groups()
+ tag=svnpath.split('/')[-1]
+ if module in self.svn: print ('Warning: duplicate SVNPATH for',module,file=o)
+ self.svn[module]=tag
+ continue
+ match=TagsFile.m_branch.match(line)
+ if match:
+ (module,branch)=match.groups()
+ if module in self.branch: print ('Warning: duplicate BRANCH for',module,file=o)
+ self.branch[module]=branch
+ continue
+ print ("%-020s"%"ignored",line,file=o)
+ # outputs relevant info
+ for n in ['branch','git','svn']:
+ d=getattr(self,n)
+ keys=list(d.keys())
+ keys.sort()
+ for key in keys: print ("%-020s %-20s %s"%(n,key,d[key]),file=o)
+
+ def norm(self): return self.filename+'.norm'
+
+ def parse(self):
+ with open(self.norm(),'w') as f:
+ self._parse(f)
+ print ("(Over)wrote",self.norm())
+
+# basic usage for now
+# $0 tagsfile1 tagsfile2
+def main ():
+ parser=ArgumentParser(description="Create a normalized (.norm) file for each input, may run diff on them")
+ parser.add_argument('tagsnames',
+ metavar='tagsfile',
+ nargs='+',
+ help="tags file names")
+ parser.add_argument("-d","--diff",action="store_true",dest="run_diff",default=False,
+ help="runs diff on the normalized outputs - requires exactly 2 args")
+
+ apres=parser.parse_args()
+ for tagsname in apres.tagsnames:
+ TagsFile(tagsname).parse()
+ if apres.run_diff and len(apres.tagsnames)==2:
+ tf1=TagsFile(apres.tagsnames[0])
+ tf2=TagsFile(apres.tagsnames[1])
+ print ("%s <-- --> %s"%(tf1.norm(),tf2.norm()))
+ command = "diff %s %s"%(tf1.norm(),tf2.norm())
+ subprocess.Popen(command,shell=True)
+
+if __name__ == '__main__':
+ main()
linux-2.6-BRANCH := 22
linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-22-50
+# this is useful for 2.6.22 but will not be needed anymore with 2.6.27
+kernel-SPECVARS += iwlwifi=1
madwifi-BRANCH := 0.9.4
madwifi-GITPATH := git://git.onelab.eu/madwifi.git@madwifi-0.9.4-3
iptables-BRANCH := 1.3.8
planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6
###
util-vserver-BUILD-FROM-SRPM := yes # tmp
-util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@master
+util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-16
libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
# 2.6.22 kernels need 0.3 branch and 2.6.27 need 0.4
util-vserver-pl-BRANCH := 0.3
-util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.3-32
+util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-26
nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-8
PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@master
codemux-GITPATH := git://git.onelab.eu/codemux.git@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-3
+Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4
inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-1
vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-1
-vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-28
-plcapi-GITPATH := git://git.onelab.eu/plcapi.git@master
+vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-29
+plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.0-33
drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH := git://git.onelab.eu/plewww.git@master
+plewww-GITPATH := git://git.onelab.eu/plewww.git@plewww-4.3-65
www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
pcucontrol-GITPATH := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-10
-Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
+monitor-GITPATH := git://git.planet-lab.eu/monitor@monitor-3.1-4
PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
###
oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.5.1-1
###
sfa-GITPATH := git://git.onelab.eu/sfa.git@master
-sface-GITPATH := git://git.onelab.eu/sface.git@master
+sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.1-12
nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-17
pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10
bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.0-10
vserver-reference-GITPATH := git://git.onelab.eu/vserver-reference.git@vserver-reference-5.0-6
bootstrapfs-GITPATH := git://git.onelab.eu/bootstrapfs.git@master
-myplc-GITPATH := git://git.onelab.eu/myplc.git@master
+myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.0-18
DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
# locating the right test directory - see make tests_gitpath
-tests-GITPATH := git://git.onelab.eu/tests.git@master
+tests-GITPATH := git://git.onelab.eu/tests.git@tests-5.0-27
linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-27-35
madwifi-GITPATH := git://git.onelab.eu/madwifi.git@madwifi-4132-2
iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.10-4
-iptables-BUILD-FROM-SRPM := yes # tmp
-iproute-BUILD-FROM-SRPM := yes
-iproute2-GITPATH := git://git.onelab.eu/iproute2.git@iproute2-2.6.35-0
+iproute2-GITPATH := git://git.onelab.eu/iproute2.git@iproute2-2.6.37-2
###
-ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-0.9-20
+ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-0.9-21
###
comgt-SVNPATH := http://svn.onelab.eu/comgt/imports/0.3
planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6
-###
-util-vserver-BUILD-FROM-SRPM := yes # tmp
-util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@master
+util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-17
libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
-# as per http://svn.planet-lab.org/changeset/17973, 2.6.22 kernels shall use 0.3 branch and 2.6.27 need 0.4
-util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-25
-nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-8
+util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-26
+nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-9
PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@master
+nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-33
pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
codemux-GITPATH := git://git.onelab.eu/codemux.git@codemux-0.1-15
-fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
+fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-3
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-3
+Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4
inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-1
vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-1
-vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-28
+vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-29
plcapi-GITPATH := git://git.onelab.eu/plcapi.git@master
drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH := git://git.onelab.eu/plewww.git@master
+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
-pcucontrol-GITPATH := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-10
-Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
+pcucontrol-GITPATH := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-11
+monitor-GITPATH := git://git.planet-lab.eu/monitor@monitor-3.1-4
PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
###
pyaspects-GITPATH := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-1
-ejabberd-GITPATH := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.3-2
+ejabberd-GITPATH := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.6-2
omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-10
oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.5.1-1
###
+
sfa-GITPATH := git://git.onelab.eu/sfa.git@master
-sface-GITPATH := git://git.onelab.eu/sface.git@master
+sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.1-16
nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
-bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-17
+bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-20
pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10
pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-9
bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.0-10
vserver-reference-GITPATH := git://git.onelab.eu/vserver-reference.git@vserver-reference-5.0-6
-bootstrapfs-GITPATH := git://git.onelab.eu/bootstrapfs.git@master
-myplc-GITPATH := git://git.onelab.eu/myplc.git@master
+bootstrapfs-GITPATH := git://git.onelab.eu/bootstrapfs.git@bootstrapfs-2.0-12
+myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.0-18
DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
# locating the right test directory - see make tests_gitpath
-tests-GITPATH := git://git.onelab.eu/tests.git@master
+tests-GITPATH := git://git.onelab.eu/tests.git@tests-5.0-27
-### temporary
-# nozomi not needed anymore for 2.6.27
-ALL:=$(subst nozomi,,$(ALL))
-IN_BOOTSTRAPFS:=$(subst nozomi,,$(IN_BOOTSTRAPFS))
###
linux-2.6-BRANCH := rhel6
-linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-16
-# help out spec2make on f8 and centos5, due to a bug in rpm
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
+linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-22
+# help out spec2make on f8 and centos5, due to a bug in rpm
+# ditto on f15 for spec2make.py - tmp hopefully
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f15 centos5)"
kernel-WHITELIST-RPMS := kernel-devel,kernel-headers
endif
kernel-DEVEL-RPMS += elfutils-libelf-devel
+
madwifi-GITPATH := git://git.onelab.eu/madwifi.git@madwifi-4132-2
-iptables-BUILD-FROM-SRPM := yes # tmp
iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.10-4
-iproute-BUILD-FROM-SRPM := yes
-iproute2-GITPATH := git://git.onelab.eu/iproute2.git@iproute2-2.6.35-0
+iproute2-GITPATH := git://git.onelab.eu/iproute2.git@iproute2-2.6.37-2
###
-ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-0.9-20
+ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-0.9-21
###
comgt-SVNPATH := http://svn.onelab.eu/comgt/imports/0.3
planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6
-###
-util-vserver-BUILD-FROM-SRPM := yes # tmp
-util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@master
+util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-17
libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
-# as per http://svn.planet-lab.org/changeset/17973, 2.6.22 kernels shall use 0.3 branch and 2.6.27 need 0.4
-util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-25
-nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-8
+util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-26
+nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-9
PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@master
+nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-33
pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
codemux-GITPATH := git://git.onelab.eu/codemux.git@codemux-0.1-15
-fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
+fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-3
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-3
+Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4
inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-1
vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-1
-vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-28
+vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-29
plcapi-GITPATH := git://git.onelab.eu/plcapi.git@master
drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH := git://git.onelab.eu/plewww.git@master
+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
-pcucontrol-GITPATH := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-10
-Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
+pcucontrol-GITPATH := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-11
+monitor-GITPATH := git://git.planet-lab.eu/monitor@monitor-3.1-4
PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
###
oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.5.1-1
###
sfa-GITPATH := git://git.onelab.eu/sfa.git@master
-sface-GITPATH := git://git.onelab.eu/sface.git@master
+sface-GITPATH := git://git.onelab.eu/sface.git@sface-0.1-16
nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5
-bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-17
+bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-20
pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10
-pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-9
+pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-9
bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.0-10
vserver-reference-GITPATH := git://git.onelab.eu/vserver-reference.git@vserver-reference-5.0-6
-bootstrapfs-GITPATH := git://git.onelab.eu/bootstrapfs.git@master
-myplc-GITPATH := git://git.onelab.eu/myplc.git@master
+bootstrapfs-GITPATH := git://git.onelab.eu/bootstrapfs.git@bootstrapfs-2.0-12
+myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.0-18
DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
# locating the right test directory - see make tests_gitpath
-tests-GITPATH := git://git.onelab.eu/tests.git@master
+tests-GITPATH := git://git.onelab.eu/tests.git@tests-5.0-27
-### temporary
-# nozomi not needed anymore for 2.6.27
-ALL:=$(subst nozomi,,$(ALL))
-IN_BOOTSTRAPFS:=$(subst nozomi,,$(IN_BOOTSTRAPFS))
else
kernel-RPMFLAGS:= --target $(HOSTARCH)
endif
-# this is useful for 2.6.22 but will not be needed anymore with 2.6.27
-kernel-SPECVARS += iwlwifi=1
kernel-SPECVARS += kernelconfig=planetlab
KERNELS += kernel
ALL += madwifi
IN_BOOTSTRAPFS += madwifi
-#
-# nozomi
-#
-nozomi-MODULES := nozomi
-nozomi-SPEC := nozomi.spec
-nozomi-DEPEND-DEVEL-RPMS += kernel-devel
-nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \
- kernel_release=$(kernel.rpm-release) \
- kernel_arch=$(kernel.rpm-arch)
-IN_BOOTSTRAPFS += nozomi
-ALL += nozomi
-
#
# comgt
#
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
+iptables-BUILD-FROM-SRPM := yes
iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
ALL += iptables
IN_BOOTSTRAPFS += iptables
#
iproute-MODULES := iproute2
iproute-SPEC := iproute.spec
+iproute-BUILD-FROM-SRPM := yes
ALL += iproute
IN_BOOTSTRAPFS += iproute
IN_VSERVER += iproute
#
util-vserver-MODULES := util-vserver
util-vserver-SPEC := util-vserver.spec
-util-vserver-RPMFLAGS:= --without dietlibc
+# starting with 0.4
+util-vserver-BUILD-FROM-SRPM := yes
+util-vserver-RPMFLAGS:= --without dietlibc --without doc
ALL += util-vserver
IN_BOOTSTRAPFS += util-vserver
openvswitch-MODULES := openvswitch
openvswitch-SPEC := openvswitch.spec
openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
-IN_BOOTSTRAPFS += openvswitch
+# maybe not in production yet
+#IN_BOOTSTRAPFS += openvswitch
ALL += openvswitch
#
#
# monitor
#
-monitor-MODULES := Monitor
+monitor-MODULES := monitor
monitor-SPEC := Monitor.spec
monitor-DEVEL-RPMS += net-snmp net-snmp-devel
ALL += monitor
#
# zabbix
#
-zabbix-MODULES := Monitor
+zabbix-MODULES := monitor
zabbix-SPEC := zabbix.spec
zabbix-BUILD-FROM-SRPM := yes
zabbix-DEVEL-RPMS += python-cherrypy
plcrt-SPEC := plcrt.spec
ALL += plcrt
+# f12 has 0.9-1 already
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
#
# pyopenssl
#
pyopenssl-SPEC := pyOpenSSL.spec
pyopenssl-BUILD-FROM-SRPM := yes
ALL += pyopenssl
+endif
#
# pyaspects
# 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-MODULES := myplc plcapi nodemanager monitor
myplc-docs-SPEC := myplc-docs.spec
ALL += myplc-docs
default_arch='x86_64'
known_arch = ['i386','x86_64']
default_fcdistro='f12'
-known_fcdistros = [ 'centos5','centos6','f8', 'f9','f10','f11','f12', 'f13', 'f14', 'sl6']
+known_fcdistros = [ 'centos5','centos6','f8', 'f9','f10','f11','f12', 'f13', 'f14', 'f15', 'sl6']
default_pldistro='onelab'
known_keywords=['groupname', 'groupdesc', 'kexclude', 'package', 'group', 'precious', 'junk', 'mirror', ]
+++ /dev/null
-# build-GITPATH is now set by vbuild-nightly.sh to avoid duplication
-
-linux-2.6-BRANCH := 22
-linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-39
-madwifi-BRANCH := 0.9.4
-madwifi-SVNPATH := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.4-3
-util-vserver-BRANCH := scholz
-util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-6
-libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
-util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-16
-NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/nodeupdate-0.5-8
-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-7
-pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-4
-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-0
-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-1
-iptables-BRANCH := 1.3.8
-iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-12
-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
-openvswitch-GITPATH := git://git.planet-lab.org/openvswitch
-vsys-GITPATH := git://git.onelab.eu/vsys@vsys-0.9-4
-vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts@vsys-scripts-0.95-25
-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-58
-www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-4
-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
-#
-# $Id$
-#
-# 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
-
iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.3.8-12
iproute2-GITPATH := git://git.planet-lab.org/iproute2.git@iproute2-2.6.16-2
util-vserver-BUILD-FROM-SRPM := yes # tmp
-util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-15
+util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-16
libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
# 2.6.22 kernels need 0.3 branch and 2.6.27 need 0.4 (trunk).
util-vserver-pl-BRANCH := 0.3
nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-8
PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
-nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-31
+nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-32
codemux-GITPATH := git://git.planet-lab.org/codemux.git@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-3
+Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4
inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
openvswitch-GITPATH := git://git.planet-lab.org/openvswitch.git
vsys-GITPATH := git://git.planet-lab.org/vsys.git@vsys-0.99-1
-vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-28
-plcapi-GITPATH := git://git.planet-lab.org/plcapi@plcapi-5.0-32
+vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-29
+plcapi-GITPATH := git://git.planet-lab.org/plcapi@plcapi-5.0-33
drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH := git://git.planet-lab.org/plewww@plewww-4.3-63
+plewww-GITPATH := git://git.planet-lab.org/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
-pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-10
-Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35
+pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-11
+monitor-GITPATH := git://git.planet-lab.org/monitor.git@monitor-3.1-4
PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
###
###
sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-1.0-21
nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-5
-bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-17
+bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-18
pypcilib-GITPATH := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-10
pyplnet-GITPATH := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-9
bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.0-10
vserver-reference-GITPATH := git://git.planet-lab.org/vserver-reference.git@vserver-reference-5.0-6
-bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-10
-myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.0-17
+bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-11
+myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.0-18
DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
# locating the right test directory - see make tests_gitpath
-tests-GITPATH := git://git.planet-lab.org/tests.git@tests-5.0-26
+tests-GITPATH := git://git.planet-lab.org/tests.git@tests-5.0-27
linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-27-35
madwifi-GITPATH := git://git.planet-lab.org/madwifi.git@madwifi-4132-2
iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptables-1.4.10-4
-iptables-BUILD-FROM-SRPM := yes # tmp
-iproute-BUILD-FROM-SRPM := yes
-iproute2-GITPATH := git://git.planet-lab.org/iproute2.git@iproute2-2.6.35-0
-util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-15
-util-vserver-BUILD-FROM-SRPM := yes # tmp
+iproute2-GITPATH := git://git.planet-lab.org/iproute2.git@iproute2-2.6.37-2
+util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-17
libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
-util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-25
-nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-8
+util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-26
+nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-9
PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-31
+nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-33
# 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
#
pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
codemux-GITPATH := git://git.planet-lab.org/codemux.git@codemux-0.1-15
-fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
+fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-3
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-3
+Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4
inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
openvswitch-GITPATH := git://git.planet-lab.org/openvswitch.git
vsys-GITPATH := git://git.planet-lab.org/vsys.git@vsys-0.99-1
-vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-28
-plcapi-GITPATH := git://git.planet-lab.org/plcapi@plcapi-5.0-32
+vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-29
+plcapi-GITPATH := git://git.planet-lab.org/plcapi@plcapi-5.0-33
drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH := git://git.planet-lab.org/plewww@plewww-4.3-63
+plewww-GITPATH := git://git.planet-lab.org/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-35
+monitor-GITPATH := git://git.planet-lab.eu/monitor@monitor-3.1-4
PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
###
pyaspects-GITPATH := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-1
-ejabberd-GITPATH := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.3-2
-omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-9
+ejabberd-GITPATH := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.6-2
+omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-10
###
-sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-1.0-21
+sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-1.0-26
nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-5
pypcilib-GITPATH := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-10
pyplnet-GITPATH := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-9
DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
-pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-10
-bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-17
+pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-11
+bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-20
bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.0-10
vserver-reference-GITPATH := git://git.planet-lab.org/vserver-reference.git@vserver-reference-5.0-6
-bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-10
-myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.0-17
+bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-12
+myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.0-18
# locating the right test directory - see make tests_gitpath
-tests-GITPATH := git://git.planet-lab.org/tests.git@tests-5.0-26
+tests-GITPATH := git://git.planet-lab.org/tests.git@tests-5.0-27
mkinitrd-GITPATH := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2
linux-2.6-BRANCH := rhel6
-linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-16
+linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-22
# help out spec2make on f8 and centos5, due to a bug in rpm
ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
kernel-WHITELIST-RPMS := kernel-devel,kernel-headers
kernel-DEVEL-RPMS += elfutils-libelf-devel
madwifi-GITPATH := git://git.planet-lab.org/madwifi.git@madwifi-4132-2
iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptables-1.4.10-4
-iptables-BUILD-FROM-SRPM := yes # tmp
-iproute-BUILD-FROM-SRPM := yes
-iproute2-GITPATH := git://git.planet-lab.org/iproute2.git@iproute2-2.6.35-0
-util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-15
-util-vserver-BUILD-FROM-SRPM := yes # tmp
+iproute2-GITPATH := git://git.planet-lab.org/iproute2.git@iproute2-2.6.37-2
+util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-17
libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
-util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-25
-nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-8
+util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-26
+nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-9
PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-31
+nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-33
# 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
#
pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
codemux-GITPATH := git://git.planet-lab.org/codemux.git@codemux-0.1-15
-fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
+fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-3
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-3
+Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.3-4
inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2
openvswitch-GITPATH := git://git.planet-lab.org/openvswitch.git
vsys-GITPATH := git://git.planet-lab.org/vsys.git@vsys-0.99-1
-vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-28
-plcapi-GITPATH := git://git.planet-lab.org/plcapi@plcapi-5.0-32
+vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-29
+plcapi-GITPATH := git://git.planet-lab.org/plcapi@plcapi-5.0-33
drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14
-plewww-GITPATH := git://git.planet-lab.org/plewww@plewww-4.3-63
+plewww-GITPATH := git://git.planet-lab.org/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-35
+monitor-GITPATH := git://git.planet-lab.org/monitor@monitor-3.1-4
PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1
###
pyaspects-GITPATH := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-1
ejabberd-GITPATH := git://git.planet-lab.org/ejabberd.git@ejabberd-2.1.6-2
-omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-9
+omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-10
###
-sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-1.0-21
+sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-1.0-26
nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-5
-bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-17
+bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-20
pypcilib-GITPATH := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-10
pyplnet-GITPATH := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-9
DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
-pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-10
+pcucontrol-GITPATH := git://git.planet-lab.org/pcucontrol.git@pcucontrol-1.0-11
bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.0-10
vserver-reference-GITPATH := git://git.planet-lab.org/vserver-reference.git@vserver-reference-5.0-6
-bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-10
-myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.0-17
+bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-12
+myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.0-18
# locating the right test directory - see make tests_gitpath
-tests-GITPATH := git://git.planet-lab.org/tests.git@tests-5.0-26
+tests-GITPATH := git://git.planet-lab.org/tests.git@tests-5.0-27
#
util-vserver-MODULES := util-vserver
util-vserver-SPEC := util-vserver.spec
-util-vserver-RPMFLAGS:= --without dietlibc
+util-vserver-BUILD-FROM-SRPM := yes
+util-vserver-RPMFLAGS:= --without dietlibc --without doc
ALL += util-vserver
IN_BOOTSTRAPFS += util-vserver
#
iptables-MODULES := iptables
iptables-SPEC := iptables.spec
+iptables-BUILD-FROM-SRPM := yes
iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
ALL += iptables
IN_BOOTSTRAPFS += iptables
#
iproute-MODULES := iproute2
iproute-SPEC := iproute.spec
+iproute-BUILD-FROM-SRPM := yes
ALL += iproute
IN_BOOTSTRAPFS += iproute
IN_VSERVER += iproute
#
# monitor
#
-monitor-MODULES := Monitor
+monitor-MODULES := monitor
monitor-SPEC := Monitor.spec
monitor-DEVEL-RPMS += net-snmp net-snmp-devel
ALL += monitor
plcrt-SPEC := plcrt.spec
ALL += plcrt
-#
-# zabbix
-#
-zabbix-MODULES := Monitor
-zabbix-SPEC := zabbix.spec
-zabbix-BUILD-FROM-SRPM := yes
-zabbix-DEVEL-RPMS += python-cherrypy
-ALL += zabbix
-
#
# pyopenssl
#
# 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-MODULES := myplc plcapi nodemanager monitor
myplc-docs-SPEC := myplc-docs.spec
ALL += myplc-docs
char *suffix_index;
for (suffix=suffixes ; *suffix ; suffix++) {
- printf("# trying %s\n",*suffix);
+ /*printf("# trying %s\n",*suffix);*/
suffix_index=strstr(fullSource,*suffix);
if (suffix_index) {
char sourcename[PATH_MAX];
--- /dev/null
+#!/usr/bin/python
+
+import sys
+import os.path
+import rpm
+
+from optparse import OptionParser
+
+def main ():
+ usage="%prog [rpmbuild-options] specfile pkg-name"
+ parser=OptionParser(usage=usage)
+ parser.add_option('-t','--target',action='store',dest='target',default=None,
+ help='specify target arch')
+ parser.add_option('-w','--whitelist-rpms',action='store',dest='whitelist',default='',
+ help='comma separated list of rpms to expose in makefile')
+ parser.add_option('-1','--with',action='store',dest='with',default='',
+ help='accept but ignore --with option')
+ parser.add_option('-0','--without',action='store',dest='without',default='',
+ help='accept but ignore --without option')
+ parser.add_option('-d','--define',action='store',dest='define',default='',
+ help='accept but ignore --define option')
+ (options,args) = parser.parse_args()
+
+ try:
+ [specfile,package_name]=args
+ except:
+ parser.print_help()
+ sys.exit(1)
+
+ ts=rpm.TransactionSet()
+ specobj = ts.parseSpec(specfile)
+ for (fullsource,_,__) in specobj.sources:
+ #print '###fullsource=',fullsource
+ print "%s.tarballs += SOURCES/%s" %(package_name,os.path.basename(fullsource))
+ for suffix in [".tar.gz", ".tgz", ".tar.bz2", ] :
+ #print "# trying %s"%suffix
+ if fullsource.endswith(suffix):
+ sourcename=fullsource.replace(suffix,"")
+ print "%s.source := SOURCES/%s" %(package_name,os.path.basename(sourcename))
+ break
+
+ # Get SRPM name from name of first package
+ package=specobj.packages[0]
+ header0=package.header
+ name=header0.format('%{name}')
+ version=header0.format('%{version}')
+ release=header0.format('%{release}')
+ print "%s.srpm := SRPMS/%s-%s-%s.src.rpm"%(package_name, name, version, release)
+
+ target = options.target
+ whitelist=[ x for x in options.whitelist.split(',') if x]
+ # Print non-empty packages
+ counter=0
+ for package in specobj.packages:
+ counter += 1
+ header=package.header
+ name=header.format('%{name}')
+ version=header.format('%{version}')
+ release=header.format('%{release}')
+ arch=target or header.format('%{arch}')
+
+ # skip dummy entries
+ if not (name and version and release and arch) : continue
+
+ # select relevant packages
+ # could not find the magic recipe to do this properly yet
+ # so ugly temporary hack :
+ # when whitelisted, we expose the first package plus the white-listed ones
+ # otherwise we expose everything
+ relevant=False
+ if not whitelist: relevant=True
+ else:
+ if counter==1: relevant=True
+ else: relevant=name in whitelist
+
+ if relevant:
+ # attach (add) rpm path to package
+ print "%s.rpms += RPMS/%s/%s-%s-%s.%s.rpm"%\
+ (package_name, arch, name, version, release, arch)
+ # convenience
+ print "%s.rpmnames += %s"%\
+ (package_name, name);
+ # attach path to rpm name
+ print "%s.rpm-path := RPMS/%s/%s-%s-%s.%s.rpm"%\
+ (name,arch, name, version, release, arch)
+ # attach package to rpm name for backward resolution - should be unique
+ print "%s.package := %s"%\
+ (name,package_name)
+
+ for macro in ["release" , "name" , "version" , "taglevel" , ] :
+ format="%%{%s}"%macro
+ try: print "%s.rpm-%s := %s"%(package_name,macro,header0.format(format))
+ except : print "# %s.rpm-%s undefined"%(package_name,macro)
+
+ # export arch
+ print "%s.rpm-arch := %s"%(package_name,target)
+
+if __name__ == '__main__':
+ main()
+++ /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-8
-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-3
-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-63
-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
-
jp_centos_url="jp_centos_url-needs-to-be-defined"
jp_epel_url="jp_epel_url-needs-to-be-defined"
-default_distroname="centos5.5"
-all_distronames="f14 centos5.5 epel5 epel6"
+default_distroname="centos5.6"
+all_distronames="f14 f15 centos5.6 epel5 epel6"
default_arch="i386"
all_archs="i386 x86_64"
fi
fi
+ BCAPFILE=/etc/vservers/$vserver/bcapabilities
+ touch $BCAPFILE
if [ -n "$VBUILD_MODE" ] ; then
### capabilities required for a build vserver
# set up appropriate vserver capabilities to mount, mknod and IPC_LOCK
- BCAPFILE=/etc/vservers/$vserver/bcapabilities
- touch $BCAPFILE
- cap=$(grep ^CAP_SYS_ADMIN /etc/vservers/$vserver/bcapabilities | wc -l)
- [ $cap -eq 0 ] && echo 'CAP_SYS_ADMIN' >> /etc/vservers/$vserver/bcapabilities
- cap=$(grep ^CAP_MKNOD /etc/vservers/$vserver/bcapabilities | wc -l)
- [ $cap -eq 0 ] && echo 'CAP_MKNOD' >> /etc/vservers/$vserver/bcapabilities
- cap=$(grep ^CAP_IPC_LOCK /etc/vservers/$vserver/bcapabilities | wc -l)
- [ $cap -eq 0 ] && echo 'CAP_IPC_LOCK' >> /etc/vservers/$vserver/bcapabilities
+ grep -q ^CAP_SYS_ADMIN $BCAPFILE || echo CAP_SYS_ADMIN >> $BCAPFILE
+ grep -q ^CAP_MKNOD $BCAPFILE || echo CAP_MKNOD >> $BCAPFILE
+ grep -q ^CAP_IPC_LOCK $BCAPFILE || echo CAP_IPC_LOCK >> $BCAPFILE
+ # useful for f15 guests that use set_cap_file
+ grep -q ^CAP_SETFCAP $BCAPFILE || echo CAP_SETFCAP >> $BCAPFILE
else
### capabilities required for a myplc vserver
# for /etc/plc.d/gpg - need to init /dev/random
- cap=$(grep ^CAP_MKNOD /etc/vservers/$vserver/bcapabilities | wc -l)
- [ $cap -eq 0 ] && echo 'CAP_MKNOD' >> /etc/vservers/$vserver/bcapabilities
- cap=$(grep ^CAP_NET_BIND_SERVICE /etc/vservers/$vserver/bcapabilities | wc -l)
- [ $cap -eq 0 ] && echo 'CAP_NET_BIND_SERVICE' >> /etc/vservers/$vserver/bcapabilities
+ grep -q ^CAP_MKNOD $BCAPFILE || echo CAP_MKNOD >> $BCAPFILE
+ grep -q ^CAP_NET_BIND_SERVICE $BCAPFILE || echo CAP_NET_BIND_SERVICE >> $BCAPFILE
+ # useful for f15 guests that use set_cap_file
+ grep -q ^CAP_SETFCAP $BCAPFILE || echo CAP_SETFCAP >> $BCAPFILE
fi
# Set persistent for the network context
- echo persistent,lback_allow > /etc/vservers/$vserver/nflags
+ # Thierry: Daniel's kernels come with single_ip turned off by default, let's make this explicit
+ echo "persistent,lback_allow,~single_ip" > /etc/vservers/$vserver/nflags
# Set cflags
echo -e "persistent\n~info_init" > /etc/vservers/$vserver/cflags
# Start Vserver automatically on boot
echo "default" > /etc/vservers/$vserver/apps/init/mark
- # Set the init style of your vserver to plain for f13
+ # Set the init style of your vserver to plain for f15 and higher
+ # not working with f15 anyways, systemd requires 2.6.36 to work
case $fcdistro in
- f13|f14) echo plain > /etc/vservers/$vserver/apps/init/style ;;
+ f1[5-9]) echo plain > /etc/vservers/$vserver/apps/init/style ;;
esac
if [ "$pkg_method" = "yum" ] ; then
packages=$(pl_getPackages -a $vserver_arch $fcdistro $pldistro $pkgsfile)
groups=$(pl_getGroups -a $vserver_arch $fcdistro $pldistro $pkgsfile)
- [ "$pkg_method" = yum ] && [ -n "$packages" ] && $personality vserver $vserver exec yum -y install $packages
- [ "$pkg_method" = yum ] && for group_plus in $groups; do
- group=$(echo $group_plus | sed -e "s,+++, ,g")
- $personality vserver $vserver exec yum -y groupinstall "$group"
- done
+ case "$pkg_method" in
+ yum)
+ [ -n "$packages" ] && $personality vserver $vserver exec yum -y install $packages
+ for group_plus in $groups; do
+ group=$(echo $group_plus | sed -e "s,+++, ,g")
+ $personality vserver $vserver exec yum -y groupinstall "$group"
+ done
+ # store current rpm list in /init-vserver.rpms in case we need to check the contents
+ $personality vserver $vserver exec rpm -aq > /vservers/$vserver/init-vserver.rpms
+ ;;
+ debootstrap)
+ $personality vserver $vserver exec apt-get update
+ for package in $packages ; do
+ $personality vserver $vserver exec apt-get install -y $package
+ done
+ ### xxx todo install groups with apt..
+ ;;
+ *)
+ echo "unknown pkg_method $pkg_method"
+ ;;
+ esac
- [ "$pkg_method" = debootstrap ] && $personality vserver $vserver exec apt-get update
- [ "$pkg_method" = debootstrap ] && for package in $packages ; do
- $personality vserver $vserver exec apt-get install -y $package
- done
-
return 0
}
MAKEVARS=("BASE=${BASE}" "${MAKEVARS[@]}")
+ # initialize latex
+ /build/latex-first-run.sh || :
+
# stage1
make -C /build $DRY_RUN "${MAKEVARS[@]}" stage1=true
# versions
git://git.onelab.eu / build.git / commitdiff