X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=27ecf17628a53c31cd67d5ab52b98903776556c8;hb=00c829b8272a47780efb1863407fe563b9054a69;hp=3c288d35516c074e45035cd5b5729bea84570c86;hpb=43c8f8c00e6cf21fb12d5154503b3ef354965fa8;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 3c288d35..27ecf176 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -40,7 +40,7 @@ IN_NODEIMAGE += $(KERNELS)
 #
 ipfwroot-MODULES := ipfw
 ipfwroot-SPEC := planetlab/ipfwroot.spec
-ipfwroot-LOCAL-STOCK-DEVEL-RPMS += kernel-devel
+ipfwroot-LOCAL-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-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)
@@ -99,7 +99,7 @@ ALL += umts-frontend
 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
 
@@ -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-LOCAL-STOCK-DEVEL-RPMS += kernel-devel kernel-headers
+libnl-LOCAL-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-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
@@ -273,7 +273,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
@@ -288,7 +288,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
@@ -336,7 +336,7 @@ ALL += bind_public
 sliver-openvswitch-MODULES := sliver-openvswitch
 sliver-openvswitch-SPEC := sliver-openvswitch.spec
 ifeq "$(DISTRONAME)" "f12"
-sliver-openvswitch-LOCAL-STOCK-DEVEL-RPMS-CRUCIAL := autoconf
+sliver-openvswitch-LOCAL-DEVEL-RPMS-CRUCIAL := autoconf
 endif
 IN_SLICEIMAGE += sliver-openvswitch
 ALL += sliver-openvswitch