Merge branch 'master' of git.onelab.eu:/git/build

[build.git] / onelab-k32-tags.mk

diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk
index 712bf33..9422a47 100644 (file)
--- a/onelab-k32-tags.mk
+++ b/onelab-k32-tags.mk
@@ -3,8 +3,10 @@
 ###
 linux-2.6-BRANCH               := rhel6
 linux-2.6-GITPATH              := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-11
-# enable hack in spec2make on f8 and centos5
-kernel-NEEDSPEC2MAKEHACK       := yes
+# help out spec2make on f8 and centos5, due to a bug in rpm
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
+kernel-WHITELIST-RPMS  := kernel-devel,kernel-headers
+endif
 kernel-DEVEL-RPMS              += elfutils-libelf-devel
 madwifi-GITPATH                 := git://git.onelab.eu/madwifi.git@madwifi-4132-2
 iptables-BUILD-FROM-SRPM        := yes # tmp
@@ -22,7 +24,7 @@ util-vserver-GITPATH          := git://git.onelab.eu/util-vserver.git@master
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 # as per http://svn.planet-lab.org/changeset/17973, 2.6.22 kernels shall use 0.3 branch and 2.6.27 need 0.4
 util-vserver-pl-GITPATH                := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-22
-nodeupdate-GITPATH             := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-7
+nodeupdate-GITPATH             := git://git.onelab.eu/nodeupdate.git@nodeupdate-0.5-8
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
 nodemanager-GITPATH             := git://git.onelab.eu/nodemanager.git@master
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11