package: doxygen
package: cronie
package: xmlsec1 xmlsec1-openssl
-package: udev
package: expat-devel
package: db4-devel
package: ncurses-devel
# openvswitch
# starting with f16 we use the stock kernel, and openvswitch needs kernel-devel
package>=f16: kernel-devel
+package>=f16: kernel-modules-extra
##########
# zabbix/monitor
package=centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@
package: libxml2-devel
# myplc-docs
package>=f18: texlive-ec
+# libvirt
+package: gettext
+package: gettext-devel
+package: gnutls-devel
+package: gnutls-utils
+package: libgcrypt-devel
+package: libtasn1-devel
+package: nmap-ncat
+package: pkgconfig
package: dnsmasq
package: bash-completion
package: kernel
-package: kernel-firmware
-package: udev
+package: linux-firmware
+package: systemd
package: basesystem
package: filesystem
package: lvm2
package: iputils
package: kbd
package: passwd
-package: procps
+package: procps-ng
package: readline
package: rootfiles
package: rpm
package: lsof
package: mailcap
package: nano
-package: nc
+package: nmap-ncat
package: openssh-clients
package: parted
package: pciutils
# platform-dependent
#
package: rsyslog
-package: util-linux-ng
+package: util-linux
package: cronie
#
package: fprobe-ulog
package: vsys
package: vsys-scripts
-package: monitor-client
-package: monitor-runlevelagent
+# ??? package: monitor-client
+# ??? package: monitor-runlevelagent
package: net-tools
### used to be in the onelab umts extension, but doesn't hurt anyone
package: pypcilib
package: openvpn
package: vim-enhanced
-# make this explicit for f14 as we need mkfs.ext2 in bm
package: e2fsprogs
-# used to be installed until f12, make it explicit for f14, might come in handy
-package>=f14: rsyslog
+package: rsyslog
package: strace lsof
-package>=f18: net-tools
+package: net-tools
+# for the new ansible-based hooks
+package: ansible
+package: git
+# experimentally ship qemu on the bootcd
+package: qemu
+package: bridge-utils
+
#################### formerly in prep.sh
junk: lib/obsolete
junk: lib/tls
groupdesc: Building PlanetLab
#
# general utilities
-package: sendmail sendmail-cf mailx
+# !!! NorNet uses postfix !!! package: sendmail
+package: postfix mailx
package: make git
package: glibc glibc-common
package: bzip2 gzip
##########
# openvswitch
# starting with f16 we use the stock kernel, and openvswitch needs kernel-devel
-# ????? package>=f16: kernel-devel
-# ????? NorNet: commented out !!!!!
+# !!! NorNet uses own kernel !!! package>=f16: kernel-devel
+# !!! NorNet uses own kernel !!! package>=f16: kernel-modules-extra
##########
# zabbix/monitor
package=centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@
package: libxml2-devel
# myplc-docs
package>=f18: texlive-ec
+# libvirt
+package: gettext
+package: gettext-devel
+package: gnutls-devel
+package: gnutls-utils
+package: libgcrypt-devel
+package: libtasn1-devel
+package: nmap-ncat
+package: pkgconfig
# ###### NorNet customisation ###############################################
package: libpcap-devel
package: libdnet-devel
package: lua-devel
+package: iptables-services
+package: nmap-ncat
+package: xorg-x11-xauth
# The following packages are needed to build the 3.11+ kernel:
package: hmaccalc
package: net-tools
package: bc
package: elfutils-devel
+package: elfutils-libelf-devel
package: audit-libs-devel
-package: gettext
package: pesign
package: openssl
# ###########################################################################
package: quota
package: rsh
package: rsync
-package: sendmail
+# !!! NorNet uses postfix !!! package: sendmail
+package: postfix
package: sudo
package: telnet
package: traceroute
package: curl
package: gzip
package: iptables
+package: iptables-services
package: dracut
package: ntp
package: perl
package: git
package: joe
package: htop
+package: info
package: libidn
package: kernel-modules-extra
package: lksctp-tools
+package: man-db
+package: mlocate
package: net-snmp-utils
package: nfs-utils
package: nmap
package: tftp
package: whois
package: wireshark
-package: xauth
+package: xorg-x11-xauth
+package: yum-utils
package: open-vm-tools
package: smartmontools
+package: nornet-nn
package: netperfmeter
package: rsplib
package: subnetcalc
-package: tracebox
+# package: tracebox
package: tsctp
# ###########################################################################
package: yum
package: iputils
package: tcpdump traceroute telnet
-package<=f18: nc
-package>=f20: nmap-ncat
+package: nmap-ncat
package: openssh-clients
package: time
# this is really old school but well..
# required for lxc-based nodes
package: dhclient
# a PL-specific, also required on lxc-based nodes
-package: bind_public
+# !!! package: bind_public
package: vsyssh
package: vsys-wrapper
package: git
package: joe
package: htop
+package: info
package: libidn
-# package: kernel-modules-extra
+# NOTE: kernel-modules-extra is needed for /lib/modules/`uname -r`/build/include!
+package: kernel-modules-extra
package: lksctp-tools
+package: man-db
+package: mlocate
package: net-snmp-utils
package: nfs-utils
package: nmap
package: tftp
package: whois
package: wireshark
-package: xauth
+package: xorg-x11-xauth
+package: yum-utils
+package: nornet-nn
package: netperfmeter
package: rsplib
package: subnetcalc
-package: tracebox
+# package: tracebox
package: tsctp
# ###########################################################################
lxc-userspace-GITPATH := git://git.onelab.eu/lxc-userspace.git@lxc-userspace-1.0-12
-transforward-GITPATH := git://git.onelab.eu/transforward.git@transforward-0.1-7
-procprotect-GITPATH := git://git.onelab.eu/procprotect.git@procprotect-0.4-5
-ipfw-GITPATH := git://git.code.sf.net/p/dummynet/code@ipfw-20130423-1
+transforward-GITPATH := git://git.onelab.eu/transforward.git@master
+procprotect-GITPATH := git://git.onelab.eu/procprotect.git@master
+ipfw-GITPATH := git://git.code.sf.net/p/dummynet/code@155b6cd31089b4763297d579e9c9945393f00c40
comgt-GITPATH := git://git.onelab.eu/comgt.git@0.3
planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.7-1
nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-11
PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
plnode-utils-GITPATH := git://git.onelab.eu/plnode-utils.git@plnode-utils-0.2-2
-nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-5.2-14
+nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-5.2-15
#
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
###
bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.2-4
sliceimage-GITPATH := git://git.onelab.eu/sliceimage.git@master
-nodeimage-GITPATH := git://git.onelab.eu/nodeimage.git@nodeimage-5.2-3
+nodeimage-GITPATH := git://git.onelab.eu/nodeimage.git@nodeimage-5.2-4
myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.3-2
#
libvirt-SPEC := libvirt.spec
libvirt-BUILD-FROM-SRPM := yes
# The --without options are breaking spec2make : hard-wired in the specfile instead
-libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds gettext gettext-devel libtasn1-devel gnutls-devel
+libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds
libvirt-STOCK-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel
libvirt-STOCK-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel
libvirt-STOCK-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub
libvirt-STOCK-DEVEL-RPMS += libblkid-devel glusterfs-api-devel glusterfs-devel
# strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
-libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel netcf-devel
+libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel
ALL += libvirt
IN_NODEREPO += libvirt
IN_NODEIMAGE += libvirt
libvirt-python-MODULES := libvirt-python
libvirt-python-SPEC := libvirt-python.spec
libvirt-python-BUILD-FROM-SRPM := yes
-libvirt-python-STOCK-DEVEL-RPMS += gnutls-utils nc pm-utils
+libvirt-python-STOCK-DEVEL-RPMS += pm-utils
libvirt-python-LOCAL-DEVEL-RPMS += libvirt-devel libvirt-docs libvirt-client
libvirt-python-RPMFLAGS := --define 'packager PlanetLab'
ALL += libvirt-python
IN_NODEIMAGE += vsys-scripts
ALL += vsys-scripts
+vsys-wrapper-MODULES := vsys-scripts
+vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
+IN_SLICEIMAGE += vsys-wrapper
+ALL += vsys-wrapper
+
#
# bind_public
#
nornet-nn-GITPATH := git://github.com/dreibh/nornet-nn.git@master
rsplib-GITPATH := git://github.com/dreibh/rsplib.git@master
subnetcalc-GITPATH := git://github.com/dreibh/subnetcalc.git@master
-tracebox-GITPATH := git://github.com/dreibh/tracebox.git@master
+# tracebox-GITPATH := git://github.com/dreibh/tracebox.git@master
tsctp-GITPATH := git://github.com/dreibh/tsctp.git@master
# ###########################################################################
# ##### NorNet ########################
-# transforward-GITPATH := git://github.com/dreibh/planetlab-lxc-transforward.git@master
-# procprotect-GITPATH := git://github.com/dreibh/planetlab-lxc-procprotect.git@master
-# ipfw-GITPATH := git://github.com/dreibh/planetlab-lxc-ipfw.git@master
+# -- transforward-GITPATH := git://github.com/dreibh/planetlab-lxc-transforward.git@master
+# -- procprotect-GITPATH := git://github.com/dreibh/planetlab-lxc-procprotect.git@master
+# -- ipfw-GITPATH := git://github.com/dreibh/planetlab-lxc-ipfw.git@master
+plcapi-GITPATH := git://github.com/dreibh/planetlab-lxc-plcapi.git@master
+bootcd-GITPATH := git://github.com/dreibh/planetlab-lxc-bootcd.git@master
+nodemanager-GITPATH := git://github.com/dreibh/planetlab-lxc-nodemanager.git@master
# #####################################
-lxc-userspace-GITPATH := git://git.planet-lab.org/lxc-userspace.git@lxc-userspace-1.0-12
-transforward-GITPATH := git://git.planet-lab.org/transforward.git@transforward-0.1-7
-procprotect-GITPATH := git://git.planet-lab.org/procprotect.git@procprotect-0.4-5
+lxc-userspace-GITPATH := git://git.onelab.eu/lxc-userspace.git@lxc-userspace-1.0-12
+transforward-GITPATH := git://git.onelab.eu/transforward.git@transforward-0.1-7
+procprotect-GITPATH := git://git.onelab.eu/procprotect.git@procprotect-0.4-5
+# !!! ipfw still needs newer version! !!!
ipfw-GITPATH := git://git.code.sf.net/p/dummynet/code@155b6cd31089b4763297d579e9c9945393f00c40
comgt-GITPATH := git://git.onelab.eu/comgt.git@0.3
planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.7-1
-nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-11
+nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-11
PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-plnode-utils-GITPATH := git://git.planet-lab.org/plnode-utils.git@plnode-utils-0.2-2
-nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@master
+plnode-utils-GITPATH := git://git.onelab.eu/plnode-utils.git@plnode-utils-0.2-2
+# !!! Using NorNet customisation! !!! nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@master
#
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-GITPATH := git://git.planet-lab.org/fprobe-ulog.git@fprobe-ulog-1.1.4-3
-libvirt-BRANCH := 1.2.3
-libvirt-GITPATH := git://git.onelab.eu/libvirt.git@libvirt-1.2.3-2
-libvirt-python-BRANCH := 1.2.3
-libvirt-python-GITPATH := git://git.onelab.eu/libvirt-python.git@libvirt-python-1.2.3-2
+codemux-GITPATH := git://git.onelab.eu/codemux.git@codemux-0.1-15
+fprobe-ulog-GITPATH := git://git.onelab.eu/fprobe-ulog.git@fprobe-ulog-1.1.4-3
+libvirt-BRANCH := 1.2.5
+libvirt-GITPATH := git://git.onelab.eu/libvirt.git@libvirt-1.2.5-1
+libvirt-python-BRANCH := 1.2.5
+libvirt-python-GITPATH := git://git.onelab.eu/libvirt-python.git@libvirt-python-1.2.5-1
pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2
-mom-GITPATH := git://git.planet-lab.org/mom.git@mom-2.3-5
-inotify-tools-GITPATH := git://git.planet-lab.org/inotify-tools.git@inotify-tools-3.13-2
-openvswitch-GITPATH := git://git.planet-lab.org/openvswitch.git@openvswitch-1.2-1
-vsys-GITPATH := git://git.planet-lab.org/vsys.git@vsys-0.99-3
-vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts.git@vsys-scripts-0.95-49
-bind_public-GITPATH := git://git.planet-lab.org/bind_public.git@bind_public-0.1-2
+mom-GITPATH := git://git.onelab.eu/mom.git@mom-2.3-5
+inotify-tools-GITPATH := git://git.onelab.eu/inotify-tools.git@inotify-tools-3.13-2
+openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@openvswitch-1.2-1
+vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-3
+vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-49
+bind_public-GITPATH := git://git.onelab.eu/bind_public.git@bind_public-0.1-2
sliver-openvswitch-GITPATH := git://git.onelab.eu/sliver-openvswitch.git@sliver-openvswitch-2.2.90-1
-plcapi-GITPATH := git://git.planet-lab.org/plcapi.git@plcapi-5.3-3
-drupal-GITPATH := git://git.planet-lab.org/drupal.git@drupal-4.7-15
-plewww-GITPATH := git://git.planet-lab.org/plewww.git@plewww-5.2-4
+# !!! Using NorNet customisation! !!! plcapi-GITPATH := git://git.planet-lab.org/plcapi.git@plcapi-5.3-3
+drupal-GITPATH := git://git.onelab.eu/drupal.git@drupal-4.7-15
+plewww-GITPATH := git://git.onelab.eu/plewww.git@plewww-5.2-4
www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5
-monitor-GITPATH := git://git.planet-lab.org/monitor@monitor-3.1-6
+monitor-GITPATH := git://git.onelab.eu/monitor@monitor-3.1-6
PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11
-pyopenssl-GITPATH := git://git.planet-lab.org/pyopenssl.git@pyopenssl-0.9-2
-pyaspects-GITPATH := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-3
-nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.2-4
-bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.2-5
-pypcilib-GITPATH := git://git.planet-lab.org/pypcilib.git@pypcilib-0.2-11
-pyplnet-GITPATH := git://git.planet-lab.org/pyplnet.git@pyplnet-4.3-18
+pyopenssl-GITPATH := git://git.onelab.eu/pyopenssl.git@pyopenssl-0.9-2
+pyaspects-GITPATH := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-3
+nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.2-4
+bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.2-5
+pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-11
+pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-18
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-13
+pcucontrol-GITPATH := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-13
###
+# omf-resctl now comes from yum and gem, no need for rvm-ruby anymore
oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.6.1-1
###
-bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.2-4
-sliceimage-GITPATH := git://git.planet-lab.org/sliceimage.git@sliceimage-5.1-8
-nodeimage-GITPATH := git://git.planet-lab.org/nodeimage.git@nodeimage-5.2-3
-myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.3-2
+# !!! Using NorNet customisation! !!! bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.2-4
+sliceimage-GITPATH := git://git.onelab.eu/sliceimage.git@master
+nodeimage-GITPATH := git://git.onelab.eu/nodeimage.git@nodeimage-5.2-4
+myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.3-2
#
sfa-BRANCH := geni-v3
-sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-9
+sfa-GITPATH := git://git.onelab.eu/sfa.git@sfa-3.1-9
#
tests-GITPATH := git://git.onelab.eu/tests.git@tests-5.3-7
kernel-WHITELIST-RPMS := kernel,kernel-headers,kernel-devel,kernel-modules-extra,kernel-tools,kernel-tools-libs,kernel-tools-libs-devel
kernel-SPECVARS += kernelconfig=planetlab
KERNELS += kernel
-kernel-STOCK-DEVEL-RPMS += elfutils-libelf-devel
+#kernel-STOCK-DEVEL-RPMS +=
kernels: $(KERNELS)
kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)
#
# tracebox
#
-tracebox-MODULES := tracebox
-tracebox-SPEC := rpm/tracebox.spec
-ALL += tracebox
-IN_NODEIMAGE += tracebox
+# tracebox-MODULES := tracebox
+# tracebox-SPEC := rpm/tracebox.spec
+# tracebox-STOCK-DEVEL-RPMS := fakeroot
+# ALL += tracebox
+# IN_NODEIMAGE += tracebox
#
# tsctp
libvirt-SPEC := libvirt.spec
libvirt-BUILD-FROM-SRPM := yes
# The --without options are breaking spec2make : hard-wired in the specfile instead
-libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds gettext gettext-devel libtasn1-devel gnutls-devel
+libvirt-STOCK-DEVEL-RPMS += xhtml1-dtds
libvirt-STOCK-DEVEL-RPMS += libattr-devel augeas libpciaccess-devel yajl-devel
libvirt-STOCK-DEVEL-RPMS += libpcap-devel radvd ebtables device-mapper-devel
libvirt-STOCK-DEVEL-RPMS += ceph-devel numactl-devel libcap-ng-devel scrub
libvirt-STOCK-DEVEL-RPMS += libblkid-devel glusterfs-api-devel glusterfs-devel
# strictly speaking fuse-devel is not required anymore but we might wish to turn fuse back on again in the future
libvirt-STOCK-DEVEL-RPMS += fuse-devel libssh2-devel dbus-devel numad
-libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-ipv6 libgcrypt-devel netcf-devel
+libvirt-STOCK-DEVEL-RPMS += systemd-devel libnl3-devel iptables-services netcf-devel
ALL += libvirt
IN_NODEREPO += libvirt
IN_NODEIMAGE += libvirt
libvirt-python-MODULES := libvirt-python
libvirt-python-SPEC := libvirt-python.spec
libvirt-python-BUILD-FROM-SRPM := yes
-libvirt-python-STOCK-DEVEL-RPMS += gnutls-utils nc pm-utils
+libvirt-python-STOCK-DEVEL-RPMS += pm-utils
libvirt-python-LOCAL-DEVEL-RPMS += libvirt-devel libvirt-docs libvirt-client
libvirt-python-RPMFLAGS := --define 'packager PlanetLab'
ALL += libvirt-python
IN_NODEIMAGE += vsys-scripts
ALL += vsys-scripts
+vsys-wrapper-MODULES := vsys-scripts
+vsys-wrapper-SPEC := slice-context/vsys-wrapper.spec
+IN_SLICEIMAGE += vsys-wrapper
+ALL += vsys-wrapper
+
#
# bind_public
#
-bind_public-MODULES := bind_public
-bind_public-SPEC := bind_public.spec
-IN_SLICEIMAGE += bind_public
-ALL += bind_public
+# bind_public-MODULES := bind_public
+# bind_public-SPEC := bind_public.spec
+# IN_SLICEIMAGE += bind_public
+# ALL += bind_public
#
# sliver-openvswitch