From: Thierry Parmentelat Date: Wed, 23 May 2012 13:53:17 +0000 (+0200) Subject: catch up with onelab as of 5.0-rc27 approx. X-Git-Url: http://git.onelab.eu/?p=wextoolbox.git;a=commitdiff_plain;h=315a4a4980761ca0c8786053102b6364cc01275e catch up with onelab as of 5.0-rc27 approx. --- diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index 0a702ce..e4398ac 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -10,31 +10,35 @@ spectools-GITPATH := git://git.onelab.eu/spectools@spectools-2009_06_R1-1 ### linux-2.6-BRANCH := 32 -linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-27 +linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-33 +ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f16 centos5)" +kernel-WHITELIST-RPMS := kernel-devel,kernel-headers +endif kernel-DEVEL-RPMS += elfutils-libelf-devel + madwifi-GITPATH := git://git.onelab.eu/madwifi.git@madwifi-4132-5 iptables-GITPATH := git://git.onelab.eu/iptables.git@iptables-1.4.10-5 ### ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-0.9-23 ### planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6 -util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-19 +util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-20 util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-26 nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-9 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-34 +nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-35 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 codemux-GITPATH := git://git.onelab.eu/codemux.git@codemux-0.1-15 -fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-3 +fprobe-ulog-GITPATH := git://git.onelab.eu/fprobe-ulog.git@fprobe-ulog-1.1.4-2 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 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-34 -plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.0-36 +vsys-scripts-GITPATH := git://git.onelab.eu/vsys-scripts.git@vsys-scripts-0.95-39 +plcapi-GITPATH := git://git.onelab.eu/plcapi.git@plcapi-5.1-1 drupal-GITPATH := git://git.onelab.eu/drupal.git@drupal-4.7-15 -plewww-GITPATH := git://git.onelab.eu/plewww.git@plewww-4.3-69 +plewww-GITPATH := git://git.onelab.eu/plewww.git@plewww-4.3-72 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5 pcucontrol-GITPATH := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-12 pyopenssl-GITPATH := git://git.onelab.eu/pyopenssl.git@pyopenssl-0.9-2 @@ -43,15 +47,15 @@ pyaspects-GITPATH := git://git.onelab.eu/pyaspects.git@pyaspects-0 omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-11 oml-GITPATH := git://git.onelab.eu/oml.git@oml-2.6.1-1 ### -nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-5 -bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-20 +nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig-5.0-7 +bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-22 pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-10 -pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-11 -bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.0-11 -vserver-reference-GITPATH := git://git.onelab.eu/vserver-reference.git@vserver-reference-5.0-6 -bootstrapfs-GITPATH := git://git.onelab.eu/bootstrapfs.git@bootstrapfs-2.0-14 -myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.0-19 +pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-14 +bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.1-2 +sliceimage-GITPATH := git://git.onelab.eu/sliceimage.git@sliceimage-5.1-1 +nodeimage-GITPATH := git://git.onelab.eu/nodeimage.git@nodeimage-2.1-1 +myplc-GITPATH := git://git.onelab.eu/myplc.git@myplc-5.1-2 # locating the right test directory - see make tests_gitpath -tests-GITPATH := git://git.onelab.eu/tests.git@tests-5.0-36 +tests-GITPATH := git://git.onelab.eu/tests.git@tests-5.1-4 diff --git a/wextoolbox.mk b/wextoolbox.mk index 99d682d..0d06ac4 100644 --- a/wextoolbox.mk +++ b/wextoolbox.mk @@ -30,7 +30,7 @@ bbn-BUILD-FROM-SRPM := yes bbn-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel swig #bbn-DEPEND-DEVEL-RPMS := gnuradio gnuradio-devel boost boost-devel ALL += bbn -IN_BOOTSTRAPFS += bbn +IN_NODEIMAGE += bbn # # crunchxml @@ -40,7 +40,7 @@ crunchxml-SPEC := crunchxml.spec crunchxml-BUILD-FROM-SRPM := yes crunchxml-DEVEL-RPMS := glib2-devel libxml-devel libxml2-devel scons ALL += crunchxml -IN_BOOTSTRAPFS += crunchxml +IN_NODEIMAGE += crunchxml # # spectools @@ -50,7 +50,7 @@ spectools-SPEC := spectools.spec spectools-BUILD-FROM-SRPM := yes spectools-DEVEL-RPMS := gtk2-devel ALL += spectools -IN_BOOTSTRAPFS += spectools +IN_NODEIMAGE += spectools # # sge @@ -64,7 +64,7 @@ sge-DEVEL-RPMS += lesstif lesstif-devel # turning this off - current focus is on deploying the sge box separately from myplc # packaging is still broken, and we're exploring a ready-to-use distro on centos # ALL += sge -# IN_BOOTSTRAPFS += sge +# IN_NODEIMAGE += sge # # kernel @@ -92,8 +92,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) # # ipfw: root context module, and slice companion @@ -105,7 +105,7 @@ ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \ kernel_release=$(kernel.rpm-release) \ kernel_arch=$(kernel.rpm-arch) ALL += ipfwroot -IN_BOOTSTRAPFS += ipfwroot +IN_NODEIMAGE += ipfwroot ipfwslice-MODULES := ipfw ipfwslice-SPEC := planetlab/ipfwslice.spec @@ -125,14 +125,14 @@ 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 # # umts: root context stuff # umts-backend-MODULES := planetlab-umts-tools umts-backend-SPEC := backend.spec -IN_BOOTSTRAPFS += umts-backend +IN_NODEIMAGE += umts-backend ALL += umts-backend # @@ -140,7 +140,7 @@ ALL += umts-backend # umts-frontend-MODULES := planetlab-umts-tools umts-frontend-SPEC := frontend.spec -IN_VSERVER += umts-frontend +IN_SLICEIMAGE += umts-frontend ALL += umts-frontend # @@ -151,7 +151,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 # # util-vserver @@ -159,9 +159,9 @@ IN_BOOTSTRAPFS += iptables util-vserver-MODULES := util-vserver util-vserver-SPEC := util-vserver.spec util-vserver-BUILD-FROM-SRPM := yes -util-vserver-RPMFLAGS:= --without dietlibc +util-vserver-RPMFLAGS:= --without dietlibc --without doc ALL += util-vserver -IN_BOOTSTRAPFS += util-vserver +IN_NODEIMAGE += util-vserver # # util-vserver-pl @@ -170,7 +170,7 @@ 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 ALL += util-vserver-pl -IN_BOOTSTRAPFS += util-vserver-pl +IN_NODEIMAGE += util-vserver-pl # # NodeUpdate @@ -178,7 +178,7 @@ IN_BOOTSTRAPFS += util-vserver-pl nodeupdate-MODULES := nodeupdate nodeupdate-SPEC := NodeUpdate.spec ALL += nodeupdate -IN_BOOTSTRAPFS += nodeupdate +IN_NODEIMAGE += nodeupdate # # ipod @@ -186,7 +186,7 @@ IN_BOOTSTRAPFS += nodeupdate ipod-MODULES := PingOfDeath ipod-SPEC := ipod.spec ALL += ipod -IN_BOOTSTRAPFS += ipod +IN_NODEIMAGE += ipod # # NodeManager @@ -194,7 +194,7 @@ IN_BOOTSTRAPFS += ipod nodemanager-MODULES := nodemanager nodemanager-SPEC := NodeManager.spec ALL += nodemanager -IN_BOOTSTRAPFS += nodemanager +IN_NODEIMAGE += nodemanager # # pl_sshd @@ -202,7 +202,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 @@ -210,7 +210,7 @@ IN_BOOTSTRAPFS += sshd codemux-MODULES := codemux codemux-SPEC := codemux.spec ALL += codemux -IN_BOOTSTRAPFS += codemux +IN_NODEIMAGE += codemux # # fprobe-ulog @@ -218,7 +218,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 # # pf2slice @@ -233,18 +233,15 @@ ALL += pf2slice mom-MODULES := Mom mom-SPEC := pl_mom.spec ALL += mom -IN_BOOTSTRAPFS += mom +IN_NODEIMAGE += mom # # vsys # vsys-MODULES := vsys vsys-SPEC := vsys.spec -vsys-DEVEL-RPMS += ocaml-ocamldoc -ifeq "$(local_inotify_tools)" "true" -vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel -endif -IN_BOOTSTRAPFS += vsys +vsys-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs +IN_NODEIMAGE += vsys ALL += vsys # @@ -252,7 +249,7 @@ ALL += vsys # vsys-scripts-MODULES := vsys-scripts vsys-scripts-SPEC := vsys-scripts.spec -IN_BOOTSTRAPFS += vsys-scripts +IN_NODEIMAGE += vsys-scripts ALL += vsys-scripts # @@ -341,7 +338,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 @@ -351,7 +348,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 @@ -380,40 +377,49 @@ ALL += bootcd IN_MYPLC += bootcd # -# vserver : reference image for slices +# 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-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 +# 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) @@ -425,15 +431,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)