X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab.mk;h=7238dbba6f88731da3208f329310a6a2d9d632ab;hb=refs%2Fheads%2Fnm-one-spec;hp=a2a378e8d4dd358cfd3368d60cf5d613e36fc96b;hpb=8cf5cd7ead66b751837bb6278a727b432cb8168b;p=build.git

diff --git a/planetlab.mk b/planetlab.mk
index a2a378e8..7238dbba 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -15,12 +15,12 @@ ifeq "$(DISTRONAME)" "centos5"
 mkinitrd-MODULES := mkinitrd
 mkinitrd-SPEC := mkinitrd.spec
 mkinitrd-BUILD-FROM-SRPM := yes
-mkinitrd-DEVEL-RPMS += parted-devel glib2-devel libdhcp4client-devel libdhcp6client-devel libdhcp-devel 
-mkinitrd-DEVEL-RPMS += device-mapper libselinux-devel libsepol-devel libnl-devel
+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_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
@@ -60,12 +60,12 @@ ifneq "$(DISTRONAME)" "f8"
 madwifi-MODULES := madwifi
 madwifi-SPEC := madwifi.spec
 madwifi-BUILD-FROM-SRPM := yes
-madwifi-DEPEND-DEVEL-RPMS += kernel-devel
+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_BOOTSTRAPFS += madwifi
+IN_NODEIMAGE += madwifi
 endif
 endif
 
@@ -75,9 +75,9 @@ endif
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
 iptables-BUILD-FROM-SRPM := yes	
-iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
+iptables-LOCAL-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
@@ -116,9 +116,9 @@ 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
+libnl-LOCAL-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += libnl
-IN_BOOTSTRAPFS += libnl
+IN_NODEIMAGE += libnl
 endif
 
 #
@@ -126,12 +126,12 @@ endif
 #
 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 
+util-vserver-pl-LOCAL-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core 
 ifeq "$(local_libnl)" "true"
-util-vserver-pl-DEPEND-DEVEL-RPMS += libnl libnl-devel
+util-vserver-pl-LOCAL-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,15 +147,22 @@ IN_BOOTSTRAPFS += nodeupdate
 ipod-MODULES := PingOfDeath
 ipod-SPEC := ipod.spec
 ALL += ipod
-IN_BOOTSTRAPFS += ipod
+IN_NODEIMAGE += ipod
 
 #
-# NodeManager
+# 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
+nodemanager-SPEC := nodemanager.spec
 ALL += nodemanager
-IN_BOOTSTRAPFS += nodemanager
+IN_NODEIMAGE += nodemanager
 
 #
 # pl_sshd
@@ -163,7 +170,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 +178,7 @@ IN_BOOTSTRAPFS += sshd
 codemux-MODULES := codemux
 codemux-SPEC   := codemux.spec
 ALL += codemux
-IN_BOOTSTRAPFS += codemux
+IN_NODEIMAGE += codemux
 
 #
 # fprobe-ulog
@@ -179,7 +186,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
@@ -199,10 +206,10 @@ ALL += pf2slice
 #
 # PlanetLab Mom: Cleans up your mess
 #
-mom-MODULES := Mom
+mom-MODULES := mom
 mom-SPEC := pl_mom.spec
 ALL += mom
-IN_BOOTSTRAPFS += mom
+IN_NODEIMAGE += mom
 
 #
 # inotify-tools - local import
@@ -221,7 +228,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
 
@@ -230,12 +237,12 @@ endif
 #
 openvswitch-MODULES := openvswitch
 openvswitch-SPEC := openvswitch.spec
-openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+openvswitch-LOCAL-DEVEL-RPMS += kernel-devel
 
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
-IN_BOOTSTRAPFS += openvswitch
-ALL += openvswitch
-endif
+#ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
+#IN_NODEIMAGE += openvswitch
+#ALL += openvswitch
+#endif
 
 #
 # vsys
@@ -243,11 +250,11 @@ endif
 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
+vsys-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
 ifeq "$(local_inotify_tools)" "true"
-vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
+vsys-LOCAL-DEVEL-RPMS += inotify-tools inotify-tools-devel
 endif
-IN_BOOTSTRAPFS += vsys
+IN_NODEIMAGE += vsys
 ALL += vsys
 
 #
@@ -255,15 +262,15 @@ ALL += vsys
 #
 vsyssh-MODULES := vsys
 vsyssh-SPEC := vsyssh.spec
-IN_SLIVER += vsyssh
+IN_SLICEIMAGE += vsyssh
 ALL += vsyssh
 
 #
 # vsys-scripts
 #
 vsys-scripts-MODULES := vsys-scripts
-vsys-scripts-SPEC := vsys-scripts.spec
-IN_BOOTSTRAPFS += vsys-scripts
+vsys-scripts-SPEC := root-context/vsys-scripts.spec
+IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 
 #
@@ -311,9 +318,9 @@ ALL += pcucontrol
 #
 monitor-MODULES := monitor
 monitor-SPEC := Monitor.spec
-monitor-DEVEL-RPMS += net-snmp net-snmp-devel
+monitor-STOCK-DEVEL-RPMS += net-snmp net-snmp-devel
 ALL += monitor
-IN_BOOTSTRAPFS += monitor
+IN_NODEIMAGE += monitor
 
 #
 # PLC RT
@@ -341,22 +348,10 @@ pyaspects-SPEC := pyaspects.spec
 pyaspects-BUILD-FROM-SRPM := yes
 ALL += pyaspects
 
-#
-# ejabberd
-#
-ejabberd-MODULES := ejabberd
-ejabberd-SPEC := ejabberd.spec
-ejabberd-BUILD-FROM-SRPM := yes
-ejabberd-DEVEL-RPMS += erlang pam-devel hevea
-# not needed anymore on f12 and above, that come with 2.1.5, and we had 2.1.3
-# so, this is relevant on f8 and centos5 only
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
-ALL += ejabberd
-endif
-
 # 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
 
@@ -367,11 +362,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
@@ -403,7 +398,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
 
@@ -413,7 +408,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
@@ -434,40 +429,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)
@@ -479,15 +483,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)