From 608e2165d4740c1a8a19027f7091a1e46ce2a74d Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 7 Jun 2011 14:41:53 +0200 Subject: [PATCH] deprecated the planetbridge distro --- config.planetbridge/bootstrapfs.pkgs | 121 ------- config.planetbridge/bootstrapfs.post | 29 -- config.planetbridge/planetbridge.mirrors | 4 - config.planetbridge/vserver-ap.pks | 5 - planetbridge-tags.mk | 46 --- planetbridge.mk | 401 ----------------------- 6 files changed, 606 deletions(-) delete mode 100644 config.planetbridge/bootstrapfs.pkgs delete mode 100644 config.planetbridge/bootstrapfs.post delete mode 100644 config.planetbridge/planetbridge.mirrors delete mode 100644 config.planetbridge/vserver-ap.pks delete mode 100644 planetbridge-tags.mk delete mode 100644 planetbridge.mk diff --git a/config.planetbridge/bootstrapfs.pkgs b/config.planetbridge/bootstrapfs.pkgs deleted file mode 100644 index 73b28043..00000000 --- a/config.planetbridge/bootstrapfs.pkgs +++ /dev/null @@ -1,121 +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: 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 diff --git a/config.planetbridge/bootstrapfs.post b/config.planetbridge/bootstrapfs.post deleted file mode 100644 index 48fe6af5..00000000 --- a/config.planetbridge/bootstrapfs.post +++ /dev/null @@ -1,29 +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 - -# 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 diff --git a/config.planetbridge/planetbridge.mirrors b/config.planetbridge/planetbridge.mirrors deleted file mode 100644 index 65256607..00000000 --- a/config.planetbridge/planetbridge.mirrors +++ /dev/null @@ -1,4 +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://build.planet-lab.org/ diff --git a/config.planetbridge/vserver-ap.pks b/config.planetbridge/vserver-ap.pks deleted file mode 100644 index f2e6d9a4..00000000 --- a/config.planetbridge/vserver-ap.pks +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/planetbridge-tags.mk b/planetbridge-tags.mk deleted file mode 100644 index 2a3efa3e..00000000 --- a/planetbridge-tags.mk +++ /dev/null @@ -1,46 +0,0 @@ -# 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 diff --git a/planetbridge.mk b/planetbridge.mk deleted file mode 100644 index 576252e9..00000000 --- a/planetbridge.mk +++ /dev/null @@ -1,401 +0,0 @@ -# $Id$ -# $URL$ -# -# declare the packages to be built and their dependencies -# initial version from Mark Huang -# Mark Huang -# Copyright (C) 2003-2006 The Trustees of Princeton University -# 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 - -- 2.43.0