uses new module names sliceimage and nodeimage

diff --git a/modules.list b/modules.list
index f7eca03..b884498 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -1,6 +1,5 @@
 bootcd
 bootmanager
-bootstrapfs
 codemux
 comgt
 DistributedRateLimiting
@@ -23,6 +22,7 @@ Mom
 monitor
 myplc
 nodeconfig
+nodeimage
 nodemanager
 nodeupdate
 omf
@@ -42,10 +42,10 @@ pypcilib
 pyplnet
 sfa
 sface
+sliceimage
 tests
 util-vserver
 util-vserver-pl
-vserver-reference
 vsys
 vsys-scripts
 www-register-wizard

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 4dc8672..275889e 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -12,10 +12,6 @@ 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
-# 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 nodeyumexclude
-ALL := $(filter-out iproute,$(ALL))
-###
 ipfw-GITPATH                    := git://git.onelab.eu/ipfw.git@ipfw-0.9-23
 ###
 comgt-SVNPATH                  := http://svn.onelab.eu/comgt/imports/0.3
@@ -56,11 +52,10 @@ bootmanager-GITPATH             := git://git.onelab.eu/bootmanager.git@bootmanag
 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@master
-vserver-reference-GITPATH       := git://git.onelab.eu/vserver-reference.git@master
-bootstrapfs-GITPATH             := git://git.onelab.eu/bootstrapfs.git@master
+sliceimage-GITPATH             := git://git.onelab.eu/sliceimage.git@master
+nodeimage-GITPATH              := git://git.onelab.eu/nodeimage.git@master
 myplc-GITPATH                   := git://git.onelab.eu/myplc.git@master
 DistributedRateLimiting-SVNPATH        := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1
 
 # locating the right test directory - see make tests_gitpath
 tests-GITPATH                   := git://git.onelab.eu/tests.git@master
-

diff --git a/onelab.mk b/onelab.mk
index 5f61aac..ce7c30d 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -32,8 +32,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
@@ -45,7 +45,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
@@ -68,7 +68,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 @@ endif
 # 
 comgt-MODULES := comgt
 comgt-SPEC := comgt.spec
-IN_BOOTSTRAPFS += comgt
+IN_NODEIMAGE += comgt
 ALL += comgt
 
 #
@@ -85,7 +85,7 @@ ALL += comgt
 #
 umts-backend-MODULES := planetlab-umts-tools
 umts-backend-SPEC := backend.spec
-IN_BOOTSTRAPFS += umts-backend
+IN_NODEIMAGE += umts-backend
 ALL += umts-backend
 
 #
@@ -93,7 +93,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
 
 #
@@ -104,18 +104,21 @@ iptables-SPEC := iptables.spec
 iptables-BUILD-FROM-SRPM := yes        
 iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += iptables
-IN_BOOTSTRAPFS += iptables
-
-#
-# iproute
-#
-iproute-MODULES := iproute2
-iproute-SPEC := iproute.spec
-iproute-BUILD-FROM-SRPM := yes 
-ALL += iproute
-IN_BOOTSTRAPFS += iproute
-IN_VSERVER += iproute
-IN_BOOTCD += iproute
+IN_NODEIMAGE += iptables
+
+###
+# 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 nodeyumexclude
+# #
+# # 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
@@ -126,7 +129,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
@@ -145,7 +148,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
 
 #
@@ -158,7 +161,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
@@ -166,7 +169,7 @@ IN_BOOTSTRAPFS += util-vserver-pl
 nodeupdate-MODULES := nodeupdate
 nodeupdate-SPEC := NodeUpdate.spec
 ALL += nodeupdate
-IN_BOOTSTRAPFS += nodeupdate
+IN_NODEIMAGE += nodeupdate
 
 #
 # ipod
@@ -174,7 +177,7 @@ IN_BOOTSTRAPFS += nodeupdate
 ipod-MODULES := PingOfDeath
 ipod-SPEC := ipod.spec
 ALL += ipod
-IN_BOOTSTRAPFS += ipod
+IN_NODEIMAGE += ipod
 
 #
 # NodeManager
@@ -182,7 +185,7 @@ IN_BOOTSTRAPFS += ipod
 nodemanager-MODULES := nodemanager
 nodemanager-SPEC := NodeManager.spec
 ALL += nodemanager
-IN_BOOTSTRAPFS += nodemanager
+IN_NODEIMAGE += nodemanager
 
 #
 # pl_sshd
@@ -190,7 +193,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
@@ -198,7 +201,7 @@ IN_BOOTSTRAPFS += sshd
 codemux-MODULES := codemux
 codemux-SPEC   := codemux.spec
 ALL += codemux
-IN_BOOTSTRAPFS += codemux
+IN_NODEIMAGE += codemux
 
 #
 # fprobe-ulog
@@ -206,7 +209,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
@@ -232,7 +235,7 @@ ALL += pf2slice
 mom-MODULES := Mom
 mom-SPEC := pl_mom.spec
 ALL += mom
-IN_BOOTSTRAPFS += mom
+IN_NODEIMAGE += mom
 
 #
 # inotify-tools - local import
@@ -251,7 +254,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
 
@@ -262,7 +265,7 @@ openvswitch-MODULES := openvswitch
 openvswitch-SPEC := openvswitch.spec
 openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
 # maybe not in production yet
-#IN_BOOTSTRAPFS += openvswitch
+#IN_NODEIMAGE += openvswitch
 ALL += openvswitch
 
 #
@@ -275,7 +278,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
 
 #
@@ -291,7 +294,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
 
 #
@@ -341,7 +344,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
@@ -432,7 +435,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
 
@@ -442,7 +445,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
@@ -473,38 +476,38 @@ 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
+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
 
 #
-# 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)
@@ -516,15 +519,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)