cleanup, kernel deps do not belong in the tags file anymore

diff --git a/onelab-tags.mk b/onelab-tags.mk
index ae01bbe..11408bc 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -3,12 +3,6 @@
 ###
 linux-2.6-BRANCH               := 32
 linux-2.6-GITPATH               := git://git.onelab.eu/linux-2.6.git@linux-2.6-32-36
-# help out spec2make on f8 and centos5, due to a bug in rpm 
-# ditto on f16 for spec2make.py - tmp hopefully
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f16 centos5)"
-kernel-WHITELIST-RPMS  := kernel-devel,kernel-headers
-endif
-kernel-STOCK-DEVEL-RPMS                += elfutils-libelf-devel
 
 ipfw-GITPATH                    := git://git.onelab.eu/ipfw-sourceforge.git@ipfw-20130423-1
 madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-6

diff --git a/onelab.mk b/onelab.mk
index 27ecf17..565163c 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -25,6 +25,13 @@ kernel-RPMFLAGS:= --target $(HOSTARCH)
 endif
 kernel-SPECVARS += kernelconfig=planetlab
 KERNELS += kernel
+#
+kernel-STOCK-DEVEL-RPMS        += elfutils-libelf-devel
+# help out spec2make on f8 and centos5, due to a bug in rpm 
+# ditto on f16 for spec2make.py - tmp hopefully
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f16 centos5)"
+kernel-WHITELIST-RPMS := kernel-devel,kernel-headers
+endif
 
 kernels: $(KERNELS)
 kernels-clean: $(foreach package,$(KERNELS),$(package)-clean)