From ca0f234e2dad50a502fa579d5e47f153ed3daf93 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 29 Mar 2012 15:51:32 +0200 Subject: [PATCH] planetlab uses new names (k32 only) sync tags --- config.planetlab/nodeimage.pkgs | 5 +- onelab-k32-tags.mk | 2 +- onelab.mk | 6 +- planetlab-k32-tags.mk | 16 ++--- planetlab.mk | 112 +++++++++++++++++--------------- 5 files changed, 77 insertions(+), 64 deletions(-) diff --git a/config.planetlab/nodeimage.pkgs b/config.planetlab/nodeimage.pkgs index 185f524b..bb959d35 100644 --- a/config.planetlab/nodeimage.pkgs +++ b/config.planetlab/nodeimage.pkgs @@ -115,8 +115,9 @@ package: NodeUpdate package: codemux package: pl_sshd package: ipod -package: vserver-@pldistro@-@fcdistro@-@arch@ -package: vserver-systemslices-@pldistro@-@fcdistro@-@arch@ +package: sliceimage-@pldistro@-@fcdistro@-@arch@ +package: sliceimage-system-@pldistro@-@fcdistro@-@arch@ +package: vserver-sliceimage package: pl_mom package: fprobe-ulog package: vsys diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk index ec4c6f57..85487650 100644 --- a/onelab-k32-tags.mk +++ b/onelab-k32-tags.mk @@ -28,7 +28,7 @@ fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tag 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 inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inotify-tools-3.13-2 -openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@openvswitch-1.1.0pre2-2 +openvswitch-GITPATH := git://git.onelab.eu/openvswitch.git@master vsys-GITPATH := git://git.onelab.eu/vsys.git@vsys-0.99-2 vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-36 plcapi-GITPATH := git://git.planet-lab.org/plcapi.git@master diff --git a/onelab.mk b/onelab.mk index ec7457dc..bdaa655a 100644 --- a/onelab.mk +++ b/onelab.mk @@ -264,9 +264,11 @@ endif openvswitch-MODULES := openvswitch openvswitch-SPEC := openvswitch.spec openvswitch-DEPEND-DEVEL-RPMS += kernel-devel -# maybe not in production yet -#IN_NODEIMAGE += openvswitch + +ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)" +IN_NODEIMAGE += openvswitch ALL += openvswitch +endif # # vsys diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index baf10f9e..c942d98d 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -18,7 +18,7 @@ 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-26 nodeupdate-GITPATH := git://git.planet-lab.org/nodeupdate.git@nodeupdate-0.5-9 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -nodemanager-GITPATH := git://git.planet-lab.org/nodemanager.git@nodemanager-2.0-34 +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 @@ -32,7 +32,7 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti openvswitch-GITPATH := git://git.planet-lab.org/openvswitch.git@master vsys-GITPATH := git://git.planet-lab.org/vsys.git@vsys-0.99-2 vsys-scripts-GITPATH := git://git.planet-lab.org/vsys-scripts@vsys-scripts-0.95-36 -plcapi-GITPATH := git://git.planet-lab.org/plcapi@plcapi-5.0-37 +plcapi-GITPATH := git://git.planet-lab.org/plcapi@master drupal-GITPATH := git://git.planet-lab.org/drupal.git@drupal-4.7-15 plewww-GITPATH := git://git.planet-lab.org/plewww@plewww-4.3-70 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5 @@ -43,7 +43,7 @@ pyopenssl-GITPATH := git://git.planet-lab.org/pyopenssl.git@pyopen pyaspects-GITPATH := git://git.planet-lab.org/pyaspects.git@pyaspects-0.4.1-2 omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-11 ### -sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.1-3 +sfa-GITPATH := git://git.planet-lab.org/sfa.git@sfa-2.1-4 sface-GITPATH := git://git.planet-lab.org/sface.git@sface-0.9-5 nodeconfig-GITPATH := git://git.planet-lab.org/nodeconfig.git@nodeconfig-5.0-6 bootmanager-GITPATH := git://git.planet-lab.org/bootmanager.git@bootmanager-5.0-20 @@ -51,9 +51,9 @@ 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-11 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-12 -bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@bootcd-5.0-11 -vserver-reference-GITPATH := git://git.planet-lab.org/vserver-reference.git@vserver-reference-5.0-6 -bootstrapfs-GITPATH := git://git.planet-lab.org/bootstrapfs.git@bootstrapfs-2.0-14 -myplc-GITPATH := git://git.planet-lab.org/myplc.git@myplc-5.0-19 +bootcd-GITPATH := git://git.planet-lab.org/bootcd.git@master +sliceimage-GITPATH := git://git.planet-lab.org/sliceimage.git@master +nodeimage-GITPATH := git://git.planet-lab.org/nodeimage.git@master +myplc-GITPATH := git://git.planet-lab.org/myplc.git@master # locating the right test directory - see make tests_gitpath -tests-GITPATH := git://git.planet-lab.org/tests.git@tests-5.0-37 +tests-GITPATH := git://git.planet-lab.org/tests.git@master diff --git a/planetlab.mk b/planetlab.mk index 0adf35f9..810aedd2 100644 --- a/planetlab.mk +++ b/planetlab.mk @@ -19,8 +19,8 @@ mkinitrd-DEVEL-RPMS += parted-devel glib2-devel libdhcp4client-devel libdhcp6cli mkinitrd-DEVEL-RPMS += device-mapper libselinux-devel libsepol-devel libnl-devel ALL += mkinitrd IN_BOOTCD += mkinitrd -IN_VSERVER += mkinitrd -IN_BOOTSTRAPFS += mkinitrd +IN_SLICEIMAGE += mkinitrd +IN_NODEIMAGE += mkinitrd IN_MYPLC += mkinitrd endif endif @@ -48,8 +48,8 @@ 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) +IN_SLICEIMAGE += $(KERNELS) +IN_NODEIMAGE += $(KERNELS) # # madwifi @@ -65,7 +65,7 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \ kernel_release=$(kernel.rpm-release) \ kernel_arch=$(kernel.rpm-arch) ALL += madwifi -IN_BOOTSTRAPFS += madwifi +IN_NODEIMAGE += madwifi endif endif @@ -77,7 +77,7 @@ iptables-SPEC := iptables.spec iptables-BUILD-FROM-SRPM := yes iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers ALL += iptables -IN_BOOTSTRAPFS += iptables +IN_NODEIMAGE += iptables # # iproute @@ -86,8 +86,8 @@ iproute-MODULES := iproute2 iproute-SPEC := iproute.spec iproute-BUILD-FROM-SRPM := yes ALL += iproute -IN_BOOTSTRAPFS += iproute -IN_VSERVER += iproute +IN_NODEIMAGE += iproute +IN_SLICEIMAGE += iproute IN_BOOTCD += iproute # @@ -99,7 +99,7 @@ util-vserver-SPEC := util-vserver.spec util-vserver-BUILD-FROM-SRPM := yes util-vserver-RPMFLAGS:= --without dietlibc --without doc ALL += util-vserver -IN_BOOTSTRAPFS += util-vserver +IN_NODEIMAGE += util-vserver # # libnl - local import @@ -118,7 +118,7 @@ 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 +IN_NODEIMAGE += libnl endif # @@ -131,7 +131,7 @@ ifeq "$(local_libnl)" "true" util-vserver-pl-DEPEND-DEVEL-RPMS += libnl libnl-devel endif ALL += util-vserver-pl -IN_BOOTSTRAPFS += util-vserver-pl +IN_NODEIMAGE += util-vserver-pl # # NodeUpdate @@ -139,7 +139,7 @@ IN_BOOTSTRAPFS += util-vserver-pl nodeupdate-MODULES := nodeupdate nodeupdate-SPEC := NodeUpdate.spec ALL += nodeupdate -IN_BOOTSTRAPFS += nodeupdate +IN_NODEIMAGE += nodeupdate # # ipod @@ -147,7 +147,7 @@ IN_BOOTSTRAPFS += nodeupdate ipod-MODULES := PingOfDeath ipod-SPEC := ipod.spec ALL += ipod -IN_BOOTSTRAPFS += ipod +IN_NODEIMAGE += ipod # # NodeManager @@ -155,7 +155,7 @@ IN_BOOTSTRAPFS += ipod nodemanager-MODULES := nodemanager nodemanager-SPEC := NodeManager.spec ALL += nodemanager -IN_BOOTSTRAPFS += nodemanager +IN_NODEIMAGE += nodemanager # # pl_sshd @@ -163,7 +163,7 @@ IN_BOOTSTRAPFS += nodemanager sshd-MODULES := pl_sshd sshd-SPEC := pl_sshd.spec ALL += sshd -IN_BOOTSTRAPFS += sshd +IN_NODEIMAGE += sshd # # codemux: Port 80 demux @@ -171,7 +171,7 @@ IN_BOOTSTRAPFS += sshd codemux-MODULES := codemux codemux-SPEC := codemux.spec ALL += codemux -IN_BOOTSTRAPFS += codemux +IN_NODEIMAGE += codemux # # fprobe-ulog @@ -179,7 +179,7 @@ IN_BOOTSTRAPFS += codemux fprobe-ulog-MODULES := fprobe-ulog fprobe-ulog-SPEC := fprobe-ulog.spec ALL += fprobe-ulog -IN_BOOTSTRAPFS += fprobe-ulog +IN_NODEIMAGE += fprobe-ulog # # DistributedRateLimiting @@ -202,7 +202,7 @@ ALL += pf2slice mom-MODULES := Mom mom-SPEC := pl_mom.spec ALL += mom -IN_BOOTSTRAPFS += mom +IN_NODEIMAGE += mom # # inotify-tools - local import @@ -221,7 +221,7 @@ 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 +IN_NODEIMAGE += inotify-tools ALL += inotify-tools endif @@ -233,7 +233,7 @@ openvswitch-SPEC := openvswitch.spec openvswitch-DEPEND-DEVEL-RPMS += kernel-devel ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)" -IN_BOOTSTRAPFS += openvswitch +IN_NODEIMAGE += openvswitch ALL += openvswitch endif @@ -247,7 +247,7 @@ 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 +IN_NODEIMAGE += vsys ALL += vsys # @@ -255,7 +255,7 @@ ALL += vsys # vsyssh-MODULES := vsys vsyssh-SPEC := vsyssh.spec -IN_SLIVER += vsyssh +IN_SLICEIMAGE += vsyssh ALL += vsyssh # @@ -263,7 +263,7 @@ ALL += vsyssh # vsys-scripts-MODULES := vsys-scripts vsys-scripts-SPEC := vsys-scripts.spec -IN_BOOTSTRAPFS += vsys-scripts +IN_NODEIMAGE += vsys-scripts ALL += vsys-scripts # @@ -313,7 +313,7 @@ monitor-MODULES := monitor monitor-SPEC := Monitor.spec monitor-DEVEL-RPMS += net-snmp net-snmp-devel ALL += monitor -IN_BOOTSTRAPFS += monitor +IN_NODEIMAGE += monitor # # PLC RT @@ -342,8 +342,9 @@ 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)" "centos5" +ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)" build_sfa=false endif @@ -354,11 +355,11 @@ ifeq "$(build_sfa)" "true" sfa-MODULES := sfa sfa-SPEC := sfa.spec ALL += sfa -endif sface-MODULES := sface sface-SPEC := sface.spec ALL += sface +endif # # nodeconfig @@ -390,7 +391,7 @@ IN_BOOTCD += pypcilib pyplnet-MODULES := pyplnet pyplnet-SPEC := pyplnet.spec ALL += pyplnet -IN_BOOTSTRAPFS += pyplnet +IN_NODEIMAGE += pyplnet IN_MYPLC += pyplnet IN_BOOTCD += pyplnet @@ -400,7 +401,7 @@ IN_BOOTCD += pyplnet omf-resctl-MODULES := omf omf-resctl-SPEC := omf-resctl.spec ALL += omf-resctl -IN_VSERVER += omf-resctl +IN_SLICEIMAGE += omf-resctl # # OMF exp controller @@ -421,40 +422,49 @@ ALL += bootcd IN_MYPLC += bootcd # -# vserver : reference image for slices +# images 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 +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 # -# bootstrapfs +# nodeimage # -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 +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 bootstrapfs and vserver -NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER),$($(package).rpms)) +# 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 := bootstrapfs +noderepo-MODULES := nodeimage noderepo-SPEC := noderepo.spec # package requires all embedded packages -noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER) +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) @@ -466,15 +476,15 @@ IN_MYPLC += noderepo # slicerepo # # all rpms resulting from packages marked as being in vserver -SLICEREPO_RPMS = $(foreach package,$(IN_VSERVER),$($(package).rpms)) +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 := bootstrapfs +slicerepo-MODULES := nodeimage slicerepo-SPEC := slicerepo.spec # package requires all embedded packages -slicerepo-DEPEND-PACKAGES := $(IN_VSERVER) +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) -- 2.47.0