refine strategy to spot ip address, keep on calling guest_ipv4

[build.git] / mlab.mk

diff --git a/mlab.mk b/mlab.mk
index ae3f623..6f2bac7 100644 (file)
--- a/mlab.mk
+++ b/mlab.mk
@@ -15,8 +15,8 @@ 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_SLICEIMAGE += mkinitrd 
@@ -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-DEVEL-RPMS += kernel-devel
 madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
        kernel_release=$(kernel.rpm-release) \
        kernel_arch=$(kernel.rpm-arch)
@@ -75,7 +75,7 @@ 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_NODEIMAGE += iptables
 
@@ -85,10 +85,10 @@ IN_NODEIMAGE += iptables
 iproute-MODULES := iproute2
 iproute-SPEC := iproute.spec
 iproute-BUILD-FROM-SRPM := yes 
-ALL += iproute
-IN_NODEIMAGE += iproute
-IN_SLICEIMAGE += iproute
-IN_BOOTCD += iproute
+#ALL += iproute
+#IN_NODEIMAGE += iproute
+#IN_SLICEIMAGE += iproute
+#IN_BOOTCD += iproute
 
 #
 # util-vserver
@@ -116,7 +116,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-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += libnl
 IN_NODEIMAGE += libnl
 endif
@@ -126,9 +126,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-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_NODEIMAGE += util-vserver-pl
@@ -149,14 +149,21 @@ ipod-SPEC := ipod.spec
 ALL += ipod
 IN_NODEIMAGE += ipod
 
-#
-# NodeManager
+# nodemanager
 #
 nodemanager-MODULES := nodemanager
-nodemanager-SPEC := NodeManager.spec
+nodemanager-SPEC := nodemanager.spec
 ALL += nodemanager
 IN_NODEIMAGE += nodemanager
 
+#
+# plnode-utils
+# 
+plnode-utils-MODULES := plnode-utils
+plnode-utils-SPEC := plnode-utils-vs.spec
+ALL += plnode-utils
+IN_NODEIMAGE += plnode-utils
+
 #
 # pl_sshd
 #
@@ -199,7 +206,7 @@ ALL += pf2slice
 #
 # PlanetLab Mom: Cleans up your mess
 #
-mom-MODULES := Mom
+mom-MODULES := mom
 mom-SPEC := pl_mom.spec
 ALL += mom
 IN_NODEIMAGE += mom
@@ -230,7 +237,7 @@ 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_NODEIMAGE += openvswitch
@@ -243,9 +250,9 @@ openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
 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_NODEIMAGE += vsys
 ALL += vsys
@@ -262,7 +269,7 @@ ALL += vsyssh
 # vsys-scripts
 #
 vsys-scripts-MODULES := vsys-scripts
-vsys-scripts-SPEC := vsys-scripts.spec
+vsys-scripts-SPEC := root-context/vsys-scripts.spec
 IN_NODEIMAGE += vsys-scripts
 ALL += vsys-scripts
 
@@ -270,7 +277,7 @@ ALL += vsys-scripts
 # plcapi
 #
 plcapi-MODULES := plcapi
-plcapi-SPEC := PLCAPI.spec
+plcapi-SPEC := plcapi.spec
 ALL += plcapi
 IN_MYPLC += plcapi
 
@@ -311,7 +318,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