From 6df6ae015927ef4279f29f38928d32f4fdfa653f Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 15 May 2014 12:56:34 +0200 Subject: [PATCH] drop planetlab distro --- planetlab-k32-tags.mk | 58 ----- planetlab.mk | 520 ------------------------------------------ 2 files changed, 578 deletions(-) delete mode 100644 planetlab-k32-tags.mk delete mode 100644 planetlab.mk diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk deleted file mode 100644 index 34b00eaf..00000000 --- a/planetlab-k32-tags.mk +++ /dev/null @@ -1,58 +0,0 @@ -mkinitrd-GITPATH := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-2 -linux-2.6-BRANCH := 32 -linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@32 -# 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 -endif -kernel-STOCK-DEVEL-RPMS += elfutils-libelf-devel -madwifi-GITPATH := git://git.planet-lab.org/madwifi.git@madwifi-4132-6 -iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptables-1.4.10-5 -# we use the stock iproute2 with 2.6.32, since our gre patch is not needed anymore with that kernel -# note that this should be consistently reflected in yumexclude -ALL := $(filter-out iproute,$(ALL)) -util-vserver-GITPATH := git://git.planet-lab.org/util-vserver.git@util-vserver-0.30.216-21 -libnl-GITPATH := git://git.planet-lab.org/libnl.git@libnl-1.1-2 -util-vserver-pl-GITPATH := git://git.planet-lab.org/util-vserver-pl.git@util-vserver-pl-0.4-28 -nodeupdate-GITPATH := git://git.planet-lab.org/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@plnode-utils-0.2-1 -nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@master -# Trellis-specific NodeManager plugins -nodemanager-topo-GITPATH := git://git.planet-lab.org/NodeManager-topo@master -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-3 -pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-2 -mom-GITPATH := git://git.planet-lab.eu/mom.git@mom-2.3-5 -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@master -vsys-GITPATH := git://git.planet-lab.org/vsys.git@vsys-0.99-3 -vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-49 -plcapi-GITPATH := git://git.planet-lab.org/plcapi.git@plcapi-5.3-2 -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 -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 -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 -omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-11 -### -sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-3.1-4 -sface-GITPATH := git://git.planet-lab.org/sface.git@sface-0.9-9 -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-4 -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-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 -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-7 -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 -# locating the right test directory - see make tests_gitpath -tests-GITPATH := git://git.planet-lab.org/tests.git@tests-5.3-4 diff --git a/planetlab.mk b/planetlab.mk deleted file mode 100644 index 7238dbba..00000000 --- a/planetlab.mk +++ /dev/null @@ -1,520 +0,0 @@ -# -# 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 -# -# see doc in Makefile -# - -# mkinitrd -# -ifeq "$(PLDISTROTAGS)" "planetlab-k32-tags.mk" -ifeq "$(DISTRONAME)" "centos5" -mkinitrd-MODULES := mkinitrd -mkinitrd-SPEC := mkinitrd.spec -mkinitrd-BUILD-FROM-SRPM := yes -mkinitrd-STOCK-DEVEL-RPMS += parted-devel glib2-devel libdhcp4client-devel libdhcp6client-devel libdhcp-devel -mkinitrd-STOCK-DEVEL-RPMS += device-mapper libselinux-devel libsepol-devel libnl-devel -ALL += mkinitrd -IN_BOOTCD += mkinitrd -IN_SLICEIMAGE += mkinitrd -IN_NODEIMAGE += 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 -kernel-SPECVARS += kernelconfig=planetlab -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_SLICEIMAGE += $(KERNELS) -IN_NODEIMAGE += $(KERNELS) - -# -# madwifi -# -# skip this with k32/f8 -ifneq "" "$(findstring k32,$(PLDISTROTAGS))" -ifneq "$(DISTRONAME)" "f8" -madwifi-MODULES := madwifi -madwifi-SPEC := madwifi.spec -madwifi-BUILD-FROM-SRPM := yes -madwifi-LOCAL-DEVEL-RPMS += kernel-devel -madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \ - kernel_release=$(kernel.rpm-release) \ - kernel_arch=$(kernel.rpm-arch) -ALL += madwifi -IN_NODEIMAGE += madwifi -endif -endif - -# -# iptables -# -iptables-MODULES := iptables -iptables-SPEC := iptables.spec -iptables-BUILD-FROM-SRPM := yes -iptables-LOCAL-DEVEL-RPMS += kernel-devel kernel-headers -ALL += iptables -IN_NODEIMAGE += iptables - -# -# iproute -# -iproute-MODULES := iproute2 -iproute-SPEC := iproute.spec -iproute-BUILD-FROM-SRPM := yes -ALL += iproute -IN_NODEIMAGE += iproute -IN_SLICEIMAGE += iproute -IN_BOOTCD += iproute - -# -# util-vserver -# -util-vserver-MODULES := util-vserver -util-vserver-SPEC := util-vserver.spec -# starting with 0.4 -util-vserver-BUILD-FROM-SRPM := yes -util-vserver-RPMFLAGS:= --without dietlibc --without doc -ALL += util-vserver -IN_NODEIMAGE += util-vserver - -# -# libnl - local import -# we need either 1.1 or at least 1.0.pre6 -# rebuild this on centos5 - see yumexclude -# -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-LOCAL-DEVEL-RPMS += kernel-devel kernel-headers -ALL += libnl -IN_NODEIMAGE += libnl -endif - -# -# util-vserver-pl -# -util-vserver-pl-MODULES := util-vserver-pl -util-vserver-pl-SPEC := util-vserver-pl.spec -util-vserver-pl-LOCAL-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core -ifeq "$(local_libnl)" "true" -util-vserver-pl-LOCAL-DEVEL-RPMS += libnl libnl-devel -endif -ALL += util-vserver-pl -IN_NODEIMAGE += util-vserver-pl - -# -# NodeUpdate -# -nodeupdate-MODULES := nodeupdate -nodeupdate-SPEC := NodeUpdate.spec -ALL += nodeupdate -IN_NODEIMAGE += nodeupdate - -# -# ipod -# -ipod-MODULES := PingOfDeath -ipod-SPEC := ipod.spec -ALL += ipod -IN_NODEIMAGE += ipod - -# -# plnode-utils -# -plnode-utils-MODULES := plnode-utils -plnode-utils-SPEC := plnode-utils-vs.spec -ALL += plnode-utils -IN_NODEIMAGE += plnode-utils - -# nodemanager -# -nodemanager-MODULES := nodemanager -nodemanager-SPEC := nodemanager.spec -ALL += nodemanager -IN_NODEIMAGE += nodemanager - -# -# pl_sshd -# -sshd-MODULES := pl_sshd -sshd-SPEC := pl_sshd.spec -ALL += sshd -IN_NODEIMAGE += sshd - -# -# codemux: Port 80 demux -# -codemux-MODULES := codemux -codemux-SPEC := codemux.spec -ALL += codemux -IN_NODEIMAGE += codemux - -# -# fprobe-ulog -# -fprobe-ulog-MODULES := fprobe-ulog -fprobe-ulog-SPEC := fprobe-ulog.spec -ALL += fprobe-ulog -IN_NODEIMAGE += fprobe-ulog - -# -# DistributedRateLimiting -# -DistributedRateLimiting-MODULES := DistributedRateLimiting -DistributedRateLimiting-SPEC := DistributedRateLimiting.spec -ALL += DistributedRateLimiting -IN_NODEREPO += DistributedRateLimiting - -# -# 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_NODEIMAGE += mom - -# -# inotify-tools - local import -# rebuild this on centos5 (not found) - see yumexclude -# -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_NODEIMAGE += inotify-tools -ALL += inotify-tools -endif - -# -# openvswitch -# -openvswitch-MODULES := openvswitch -openvswitch-SPEC := openvswitch.spec -openvswitch-LOCAL-DEVEL-RPMS += kernel-devel - -#ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)" -#IN_NODEIMAGE += openvswitch -#ALL += openvswitch -#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-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs -ifeq "$(local_inotify_tools)" "true" -vsys-LOCAL-DEVEL-RPMS += inotify-tools inotify-tools-devel -endif -IN_NODEIMAGE += vsys -ALL += vsys - -# -# vsyssh : installed in slivers -# -vsyssh-MODULES := vsys -vsyssh-SPEC := vsyssh.spec -IN_SLICEIMAGE += vsyssh -ALL += vsyssh - -# -# vsys-scripts -# -vsys-scripts-MODULES := vsys-scripts -vsys-scripts-SPEC := root-context/vsys-scripts.spec -IN_NODEIMAGE += 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 -monitor-STOCK-DEVEL-RPMS += net-snmp net-snmp-devel -ALL += monitor -IN_NODEIMAGE += monitor - -# -# PLC RT -# -plcrt-MODULES := PLCRT -plcrt-SPEC := plcrt.spec -ALL += plcrt - -# f12 has 0.9-1 already -ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)" -# -# pyopenssl -# -pyopenssl-MODULES := pyopenssl -pyopenssl-SPEC := pyOpenSSL.spec -pyopenssl-BUILD-FROM-SRPM := yes -ALL += pyopenssl -endif - -# -# pyaspects -# -pyaspects-MODULES := pyaspects -pyaspects-SPEC := pyaspects.spec -pyaspects-BUILD-FROM-SRPM := yes -ALL += pyaspects - -# sfa now uses the with statement that's not supported on python-2.4 - not even through __future__ -# In addition we now use sqlalchemy and 0.5 as per f12 is not compatible with our model -build_sfa=true -ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)" -build_sfa=false -endif - -ifeq "$(build_sfa)" "true" -# -# sfa - Slice Facility Architecture -# -sfa-MODULES := sfa -sfa-SPEC := sfa.spec -ALL += sfa - -sface-MODULES := sface -sface-SPEC := sface.spec -ALL += sface -endif - -# -# nodeconfig -# -nodeconfig-MODULES := nodeconfig -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_NODEIMAGE += pyplnet -IN_MYPLC += pyplnet -IN_BOOTCD += pyplnet - -# -# OMF resource controller -# -omf-resctl-MODULES := omf -omf-resctl-SPEC := omf-resctl.spec -ALL += omf-resctl -IN_SLICEIMAGE += omf-resctl - -# -# OMF exp controller -# -omf-expctl-MODULES := omf -omf-expctl-SPEC := omf-expctl.spec -ALL += omf-expctl - -# -# 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 - -# -# images for slices -# -sliceimage-MODULES := sliceimage build -sliceimage-SPEC := sliceimage.spec -sliceimage-DEPEND-PACKAGES := $(IN_SLICEIMAGE) -sliceimage-DEPEND-FILES := RPMS/yumgroups.xml -sliceimage-RPMDATE := yes -ALL += sliceimage -IN_NODEIMAGE += sliceimage - -# -# vserver-specific sliceimage initialization -# -vserver-sliceimage-MODULES := sliceimage -vserver-sliceimage-SPEC := vserver-sliceimage.spec -vserver-sliceimage-RPMDATE := yes -ALL += vserver-sliceimage -IN_NODEIMAGE += vserver-sliceimage - -# -# nodeimage -# -nodeimage-MODULES := nodeimage build -nodeimage-SPEC := nodeimage.spec -nodeimage-DEPEND-PACKAGES := $(IN_NODEIMAGE) -nodeimage-DEPEND-FILES := RPMS/yumgroups.xml -nodeimage-RPMDATE := yes -ALL += nodeimage -IN_MYPLC += nodeimage - -# -# noderepo -# -# all rpms resulting from packages marked as being in nodeimage and sliceimage -NODEREPO_RPMS = $(foreach package,$(IN_NODEIMAGE) $(IN_NODEREPO) $(IN_SLICEIMAGE),$($(package).rpms)) -# replace space with +++ (specvars cannot deal with spaces) -SPACE=$(subst x, ,x) -NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS)) - -noderepo-MODULES := nodeimage -noderepo-SPEC := noderepo.spec -# package requires all embedded packages -noderepo-DEPEND-PACKAGES := $(IN_NODEIMAGE) $(IN_NODEREPO) $(IN_SLICEIMAGE) -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 - -# -# slicerepo -# -# all rpms resulting from packages marked as being in vserver -SLICEREPO_RPMS = $(foreach package,$(IN_SLICEIMAGE),$($(package).rpms)) -# replace space with +++ (specvars cannot deal with spaces) -SPACE=$(subst x, ,x) -SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS)) - -slicerepo-MODULES := nodeimage -slicerepo-SPEC := slicerepo.spec -# package requires all embedded packages -slicerepo-DEPEND-PACKAGES := $(IN_SLICEIMAGE) -slicerepo-DEPEND-FILES := RPMS/yumgroups.xml -#export rpm list to the specfile -slicerepo-SPECVARS = slice_rpms_plus=$(SLICEREPO_RPMS_3PLUS) -slicerepo-RPMDATE := yes -ALL += slicerepo - -# -# MyPLC : lightweight packaging, dependencies are yum-installed in a vserver -# -myplc-MODULES := myplc -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