From 465dca4397b465d96867874fb816ef2c8decc523 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 1 Sep 2011 18:48:35 +0200 Subject: [PATCH] coblitz sits on a separate branch --- coblitz-latest-tags.mk | 47 ----- coblitz-stable-tags.mk | 45 ----- coblitz.mk | 401 ----------------------------------------- 3 files changed, 493 deletions(-) delete mode 100644 coblitz-latest-tags.mk delete mode 100644 coblitz-stable-tags.mk delete mode 100644 coblitz.mk diff --git a/coblitz-latest-tags.mk b/coblitz-latest-tags.mk deleted file mode 100644 index e2dffb91..00000000 --- a/coblitz-latest-tags.mk +++ /dev/null @@ -1,47 +0,0 @@ -# build-GITPATH is now set by vbuild-nightly.sh to avoid duplication - -mkinitrd-GITPATH := git://git.verivue.com/planetlab/mkinitrd.git@mkinitrd-5.1.19.6-3 -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-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-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-9 -nodemanager-GITPATH := git://git.verivue.com/planetlab/nodemanager@nodemanager-1.8-38 -pyplnet-GITPATH := git://git.verivue.com/planetlab/pyplnet@pyplnet-4.3-12 -codemux-GITPATH := git://git.verivue.com/planetlab/codemux.git@CoDemux-0.1-13 -iptables-BUILD-FROM-SRPM := yes # tmp -iptables-GITPATH := git://git.verivue.com/planetlab/iptables.git@iptables-1.4.10-4 -iproute-BUILD-FROM-SRPM := yes # tmp -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-31 -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 -pcucontrol-GITPATH := git://git.verivue.com/planetlab/pcucontrol.git@pcucontrol-1.0-10 -nodeconfig-GITPATH := git://git.verivue.com/planetlab/nodeconfig.git@nodeconfig-4.3-10 -bootmanager-BRANCH := 4.3 -bootmanager-GITPATH := git://git.verivue.com/planetlab/bootmanager@bootmanager-4.3-28 -pypcilib-GITPATH := git://git.verivue.com/planetlab/pypcilib.git@pypcilib-0.2-10 -bootcd-GITPATH := git://git.verivue.com/planetlab/bootcd.git@bootcd-4.2-25 -vserver-reference-GITPATH := git://git.verivue.com/planetlab/vserver-reference@vserver-reference-4.2-18 -bootstrapfs-GITPATH := git://git.verivue.com/planetlab/bootstrapfs.git@BootstrapFS-1.0-12 -myplc-GITPATH := git://git.verivue.com/planetlab/myplc@myplc-4.3-53 -pyopenssl-GITPATH := git://git.verivue.com/planetlab/pyopenssl.git@pyopenssl-0.9-1 -monitor-GITPATH := git://git.verivue.com/planetlab/monitor.git@Monitor-3.0-29 -pyaspects-GITPATH := git://git.verivue.com/planetlab/pyaspects.git@pyaspects-0.4.1-1 - -ifeq "$(DISTRONAME)" "centos5" -yum-GITPATH := git://git.verivue.com/planetlab/yum.git@centos5 -endif -ifeq "$(DISTRONAME)" "sl6" -yum-GITPATH := git://git.verivue.com/planetlab/yum.git@rhel6 -certmaster-GITPATH := git://git.verivue.com/certmaster.git@certmaster-0.28-1 -func-GITPATH := git://git.verivue.com/func.git@func-0.28-1 -endif - -# locating the right test directory - see make tests_gitpath -tests-GITPATH := git://git.verivue.com/tests.git@verivue diff --git a/coblitz-stable-tags.mk b/coblitz-stable-tags.mk deleted file mode 100644 index 39f33d1f..00000000 --- a/coblitz-stable-tags.mk +++ /dev/null @@ -1,45 +0,0 @@ -# build-GITPATH is now set by vbuild-nightly.sh to avoid duplication - -linux-2.6-BRANCH := coblitz -linux-2.6-SVNPATH := http://svn.planet-lab.org/svn/linux-2.6/tags/linux-2.6-22-41.coblitz -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-27 -NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-5 -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-25 -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-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-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 -inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 -vsys-BRANCH := 0.9 -vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4 -vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-12 -PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-35 -drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-14 -PLEWWW-GITPATH := git://git.onelab.eu/plewww@PLEWWW-4.3-41 -www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3 -Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-29 -pcucontrol-SVNPATH := http://svn.planet-lab.org/svn/pcucontrol/tags/pcucontrol-1.0-0 -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-15 -pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-9 -BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-16 -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-10 -MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-36 -sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-13 -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-11 - -# locating the right test directory - see make tests_gitpath -tests-GITPATH := git://git.onelab.eu/tests.git@tests-4.3-6 diff --git a/coblitz.mk b/coblitz.mk deleted file mode 100644 index bf6e57b0..00000000 --- a/coblitz.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 -# -# -# certmaster & func -# -ifeq "$(PLDISTROTAGS)" "coblitz-latest-tags.mk" -ifeq "$(DISTRONAME)" "sl6" - -certmaster-MODULES := certmaster -certmaster-SPEC := certmaster.spec -ALL += certmaster -IN_BOOTSTRAPFS += certmaster -IN_MYPLC += certmaster - -#func -func-MODULES := func -func-SPEC := func.spec -ALL += func -IN_BOOTSTRAPFS += func -IN_MYPLC += func - -endif -endif - -# -# mkinitrd -# -ifeq "$(PLDISTROTAGS)" "coblitz-latest-tags.mk" -ifeq "$(DISTRONAME)" "centos5" -mkinitrd-MODULES := mkinitrd -mkinitrd-SPEC := mkinitrd.spec -mkinitrd-BUILD-FROM-SRPM := yes -ALL += mkinitrd -IN_BOOTCD += mkinitrd -IN_VSERVER += mkinitrd -IN_BOOTSTRAPFS += mkinitrd -IN_MYPLC += mkinitrd -endif -endif - -# -# 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) - -# -# 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 - -# -# NodeManager -# -nodemanager-MODULES := nodemanager -nodemanager-SPEC := NodeManager.spec -ALL += nodemanager -IN_BOOTSTRAPFS += nodemanager - -# -# 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 "$(DISTRONAME)" "sl6" -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 -# ocaml-docs is not needed anymore but keep it on a tmp basis as some tags may still have it -vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs -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 - -# -# pcucontrol -# -pcucontrol-MODULES := pcucontrol -pcucontrol-SPEC := pcucontrol.spec -ALL += pcucontrol - - -## monitor -# -monitor-MODULES := monitor -monitor-SPEC := Monitor.spec -monitor-DEVEL-RPMS += net-snmp net-snmp-devel -ALL += monitor -IN_BOOTSTRAPFS += monitor - - -# -# pyopenssl -# -pyopenssl-MODULES := pyopenssl -pyopenssl-SPEC := pyOpenSSL.spec -pyopenssl-BUILD-FROM-SRPM := yes -ALL += pyopenssl - -# -# pyaspects -# -pyaspects-MODULES := pyaspects -pyaspects-SPEC := pyaspects.spec -pyaspects-BUILD-FROM-SRPM := yes -ALL += pyaspects - -# -# 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 := vserver-reference 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 -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 - -ifeq "$(PLDISTROTAGS)" "coblitz-latest-tags.mk" -# chroot supported yum -yum-MODULES := yum -yum-SPEC := yum.spec -yum-BUILD-FROM-SRPM := yes -ALL += yum -endif -- 2.47.0