X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=d0f5d3f1a583b69636c6a2c4e3cad148a51f7d9c;hb=38e1b3fbaab1ff3661c12094c1dfb769b9255300;hp=2592eab9e4e26565228fdd3b001f61300f195a1e;hpb=f3d7b124e8f690328b2813973e8da9ae22b6e9b7;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 2592eab9..d0f5d3f1 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -40,7 +40,7 @@ IN_NODEIMAGE += $(KERNELS)
 #
 ipfwroot-MODULES := ipfw
 ipfwroot-SPEC := planetlab/ipfwroot.spec
-ipfwroot-DEPEND-DEVEL-RPMS += kernel-devel
+ipfwroot-LOCAL-STOCK-DEVEL-RPMS += kernel-devel
 ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
         kernel_release=$(kernel.rpm-release) \
         kernel_arch=$(kernel.rpm-arch)
@@ -60,7 +60,7 @@ ifneq "$(DISTRONAME)" "f8"
 madwifi-MODULES := madwifi
 madwifi-SPEC := madwifi.spec
 madwifi-BUILD-FROM-SRPM := yes
-madwifi-DEPEND-DEVEL-RPMS += kernel-devel
+madwifi-LOCAL-STOCK-DEVEL-RPMS += kernel-devel
 madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 	kernel_release=$(kernel.rpm-release) \
 	kernel_arch=$(kernel.rpm-arch)
@@ -99,7 +99,7 @@ ALL += umts-frontend
 iptables-MODULES := iptables
 iptables-SPEC := iptables.spec
 iptables-BUILD-FROM-SRPM := yes	
-iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
+iptables-LOCAL-STOCK-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += iptables
 IN_NODEIMAGE += iptables
 
@@ -143,7 +143,7 @@ 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-STOCK-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += libnl
 IN_NODEIMAGE += libnl
 endif
@@ -153,9 +153,9 @@ 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-STOCK-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-STOCK-DEVEL-RPMS += libnl libnl-devel
 endif
 ALL += util-vserver-pl
 IN_NODEIMAGE += util-vserver-pl
@@ -273,7 +273,7 @@ endif
 # #
 # openvswitch-MODULES := openvswitch
 # openvswitch-SPEC := openvswitch.spec
-# openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
+# openvswitch-LOCAL-STOCK-DEVEL-RPMS += kernel-devel
 # 
 # ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
 # IN_NODEIMAGE += openvswitch
@@ -286,9 +286,9 @@ 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-STOCK-DEVEL-RPMS += inotify-tools inotify-tools-devel
 endif
 IN_NODEIMAGE += vsys
 ALL += vsys
@@ -322,10 +322,21 @@ autoconf-BUILD-FROM-SRPM := yes
 ALL += autoconf
 endif
 
+#
+# bind_public
+#
+bind_public-MODULES := bind_public
+bind_public-SPEC := bind_public.spec
+IN_SLICEIMAGE += bind_public
+ALL += bind_public
+
+#
+# sliver-openvswitch
+#
 sliver-openvswitch-MODULES := sliver-openvswitch
 sliver-openvswitch-SPEC := sliver-openvswitch.spec
 ifeq "$(DISTRONAME)" "f12"
-sliver-openvswitch-DEPEND-DEVEL-RPMS-UPDATES := autoconf
+sliver-openvswitch-LOCAL-STOCK-DEVEL-RPMS-CRUCIAL := autoconf
 endif
 IN_SLICEIMAGE += sliver-openvswitch
 ALL += sliver-openvswitch
@@ -375,7 +386,7 @@ 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_NODEIMAGE += monitor
 
@@ -405,26 +416,6 @@ 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
 #
@@ -460,25 +451,18 @@ IN_MYPLC += pyplnet
 IN_BOOTCD += pyplnet
 
 #
-# OMF resource controller
+# for OMF resource controller as  a gem : rvm-ruby has right version of ruby and related gem stuff
 #
-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
+rvm-ruby-MODULES := rvm-ruby
+rvm-ruby-SPEC := rpm/rvm-ruby.spec
+rvm-ruby-STOCK-DEVEL-RPMS := chrpath libyaml-devel libffi-devel libxslt-devel
+ALL += rvm-ruby
 
 #
 # OML measurement library
 #
 oml-MODULES := oml
-oml-DEVEL-RPMS += sqlite-devel 
+oml-STOCK-DEVEL-RPMS += sqlite-devel 
 oml-SPEC := liboml.spec
 ALL += oml
 
@@ -584,6 +568,34 @@ release-SPEC := myplc-release.spec
 release-RPMDATE := yes
 ALL += release
 
+##############################
+# sfa requires python-2.7
+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
+
+##############################
+# don't build these by default, we have separate builds for that
 myslice-MODULES := myslice
 myslice-SPEC := myslice.spec
-ALL += myslice
+myslice-STOCK-DEVEL-RPMS := python-django
+myslice-STOCK-DEVEL-DEBS := python-django
+#ALL += myslice
+
+manifold-MODULES := manifold
+manifold-SPEC := manifold.spec
+#ALL += manifold