From: Thierry Parmentelat Date: Thu, 1 Sep 2011 16:49:24 +0000 (+0200) Subject: coblitz sits on a separate branch X-Git-Tag: 5.0-rc23~1 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2bf0ec4faab4050ec1edde604d746a84a37a34fe;p=build.git coblitz sits on a separate branch --- diff --git a/config.coblitz/bootstrapfs.pkgs b/config.coblitz/bootstrapfs.pkgs deleted file mode 100644 index b1ee803b..00000000 --- a/config.coblitz/bootstrapfs.pkgs +++ /dev/null @@ -1,127 +0,0 @@ -# $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>=sl6: lvm2 -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>=centos5: anacron -package>=sl6: cronie-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>=centos5: mkinitrd -package>=sl6: dracut -package: ntp -package: perl -package: python -package: tar -package: expect -package: openvpn -package: vconfig -package: PyXML - -# -# platform-dependent -# -package>=f8 package=sl6: rsyslog -package=centos5: sysklogd - -package>=f8 package>=sl6: util-linux-ng -package=centos5: util-linux - -package<=f8 package=centos5: termcap libtermcap vixie-cron -# -# planetlab -# -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: 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 - -# -# wireless support -# -#package: madwifi -#package: wireless-tools - -package=sl6 package=centos5: puppet diff --git a/config.coblitz/bootstrapfs.post b/config.coblitz/bootstrapfs.post deleted file mode 100644 index a099ef84..00000000 --- a/config.coblitz/bootstrapfs.post +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -vdir=$1 -if [ -z "${vdir}" ] ; then - echo "ERROR: $0" - echo "Provide the directory of the root filesystem to operate on" - exit -fi - -# 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 vservers-default fprobe-ulog; 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 - -# Remove 32bit packages from 64bit system -# use rpm instead of yum as /proc is not mounted at that poing -if echo ${vdir} | grep -q x86_64 ; then - chroot ${vdir} rpm -qa --qf '%{name}.%{arch}\n' | grep 'i[36]86$' | xargs chroot ${vdir} rpm -e -fi diff --git a/config.coblitz/coblitz.mirrors b/config.coblitz/coblitz.mirrors deleted file mode 100644 index 90ed93e0..00000000 --- a/config.coblitz/coblitz.mirrors +++ /dev/null @@ -1,6 +0,0 @@ -# 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://localhost/repo -mirror: http://repo.verivue.com/repo/ -mirror: http://yoda.verivue.com/repo/ diff --git a/config.coblitz/devel.pkgs b/config.coblitz/devel.pkgs deleted file mode 100644 index 03292d51..00000000 --- a/config.coblitz/devel.pkgs +++ /dev/null @@ -1,111 +0,0 @@ -# $Id$ -# $URL$ -# -groupname: PlanetLabDevel -groupdesc: Building PlanetLab -# general utilities -package: sendmail sendmail-cf mailx -package: make install -package: glibc glibc-common -package: bzip2 gzip -package: cpio tar -package: coreutils -package: rpm rpm-build rpm-devel -package: redhat-rpm-config -package: curl curl-devel -package: subversion cvs -package: less -package: openssh -package: emacs-nox -# undetermined -package: expect -package: gd -package: httpd mod_python mod_ssl -package: openssl -package: openssl-devel -package: zlib -package: zlib-devel -package: bison flex -package: libtool -package: metadata -package: mysql mysql-devel mysql-server -package: python python-devel -package: doxygen -package: vixie-cron -package: xmlsec1 xmlsec1-openssl -package: udev -package: expat-devel -package: db4-devel -package: ncurses-devel -package: readline-devel -package: dnsmasq -# for spec2make / rpmlib -package<=f8: popt-devel -# kernel -package: gnupg -package: diffutils -package: vconfig -package: iptables -package: wget -package: beecrypt-devel -package: tetex-latex -package: gcc-c++ -package: patchutils -package: binutils-devel -# iptables -package: linuxdoc-tools -package: sudo -package: yum createrepo -# mysql -package: gperf -package: time -# bootmanager -package: sharutils -# bootcd -package: nasm -package: mkisofs -package: dosfstools -package: mtools -package: syslinux -# myplc -package: rsync -package: ghostscript -# PLCAPI -package: docbook-utils-pdf -package: postgresql postgresql-devel postgresql-python postgresql-server -# if we don't specify @arch@ for php-devel, we end up with the 2 variants (i386 and x86_64) -# in an undetermined order, and php-config --extension-dir might return the wrong place -package: php php-devel.@arch@ php-gd php-pgsql -package: PyXML -# used to reference SOAPpy as well -# for pypcilib -package: pciutils-devel -########## -# for vsys - same as for php-devel above -package: ocaml.@arch@ ocaml-docs -# use local inotify-tools on centos -package>=f8: inotify-tools-devel -# for util-vserver -package: ctags -package>=sl6: e2fsprogs nss-devel -########## -## for util-vserver-pl -# use local libnl on centos -package>=f8 package=sl6: libnl-devel -# zabbix/monitor -package: net-snmp net-snmp-devel -package>=centos5 package=sl6: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@ -package: python-cherrypy -########## -# for sfa : rebuilding wsdl index at build-time -package: python-uuid pyOpenSSL m2crypto -# for git -package: make git -# for mkinitrd -package=centos5: parted-devel glib2-devel libdhcp4client-devel libdhcp6client-devel libdhcp-devel device-mapper libselinux-devel libsepol-devel libnl-devel -# for log4* -package: log4c-devel log4cpp-devel log4j erlang-log4erl -# for yum -package: gettext intltool -# for certmaster/func -package>=sl6: python-setuptools diff --git a/config.coblitz/vserver.pkgs b/config.coblitz/vserver.pkgs deleted file mode 100644 index dc28e916..00000000 --- a/config.coblitz/vserver.pkgs +++ /dev/null @@ -1,46 +0,0 @@ -# $Id$ -# $URL$ -# -groupname: PlanetLabSlice -groupdesc: PlanetLab Slice Reference Image -# packages to exclude from stock repositories -kexclude: @KEXCLUDE@ -# define packages -package: bash -package: coreutils -package: iputils -package: kernel-vserver -package: bzip2 -package: crontabs -package: diffutils -package: logrotate -package: openssh-clients -package: passwd -package: rsh -package: rsync -package: sudo -package: tcpdump -package: telnet -package: traceroute -package: time -package: wget -package: which -package: yum -package: curl -package: gzip -package: perl -package: python -package: python-devel -package: tar -package: findutils -package: filesystem - -package<=f8 package=centos5: vixie-cron -package>=f10: cronie - -package: log4c -package: log4cpp -package: log4j -package: erlang-log4erl - -package=sl6 package=centos5: puppet