X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=mlab.mk;h=6f2bac7eb812d8b08c7399cd4316e40254d9b6ca;hb=38239bbbb43ddbeaf8e64f89826a47ddc6aa5b50;hp=2dd151b5f1bcfbbea9dfac082fa3720308197cb4;hpb=f05bfddf8a44de63e64ce9871a54f97360a2d200;p=build.git

diff --git a/mlab.mk b/mlab.mk
index 2dd151b5..6f2bac7e 100644
--- a/mlab.mk
+++ b/mlab.mk
@@ -60,7 +60,7 @@ ifneq "$(DISTRONAME)" "f8"
 madwifi-MODULES := madwifi
 madwifi-SPEC := madwifi.spec
 madwifi-BUILD-FROM-SRPM := yes
-madwifi-LOCAL-STOCK-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-LOCAL-STOCK-DEVEL-RPMS += kernel-devel kernel-headers
+iptables-LOCAL-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += iptables
 IN_NODEIMAGE += iptables
 
@@ -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-LOCAL-STOCK-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-LOCAL-STOCK-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-LOCAL-STOCK-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,24 +149,12 @@ ipod-SPEC := ipod.spec
 ALL += ipod
 IN_NODEIMAGE += ipod
 
-#
-# NodeManager
-#
-#nodemanager-MODULES := nodemanager
-#nodemanager-SPEC := NodeManager.spec
-#ALL += nodemanager
-#IN_NODEIMAGE += nodemanager
-
 # nodemanager
-nodemanager-lib-MODULES := nodemanager
-nodemanager-lib-SPEC := nodemanager-lib.spec
-ALL += nodemanager-lib
-IN_NODEIMAGE += nodemanager-lib
-nodemanager-vs-MODULES := nodemanager
-nodemanager-vs-SPEC := nodemanager-vs.spec
-ALL += nodemanager-vs
-IN_NODEIMAGE += nodemanager-vs
-
+#
+nodemanager-MODULES := nodemanager
+nodemanager-SPEC := nodemanager.spec
+ALL += nodemanager
+IN_NODEIMAGE += nodemanager
 
 #
 # plnode-utils
@@ -249,7 +237,7 @@ endif
 #
 openvswitch-MODULES := openvswitch
 openvswitch-SPEC := openvswitch.spec
-openvswitch-LOCAL-STOCK-DEVEL-RPMS += kernel-devel
+openvswitch-LOCAL-DEVEL-RPMS += kernel-devel
 
 #ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f14 f15 f16)"
 #IN_NODEIMAGE += openvswitch
@@ -264,7 +252,7 @@ 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-STOCK-DEVEL-RPMS += ocaml-ocamldoc ocaml-docs
 ifeq "$(local_inotify_tools)" "true"
-vsys-LOCAL-STOCK-DEVEL-RPMS += inotify-tools inotify-tools-devel
+vsys-LOCAL-DEVEL-RPMS += inotify-tools inotify-tools-devel
 endif
 IN_NODEIMAGE += vsys
 ALL += vsys