From: Thierry Parmentelat Date: Thu, 17 Feb 2011 20:18:48 +0000 (+0100) Subject: add kernel-headers to whitelist, and only in f8 or centos5 X-Git-Tag: util-vserver-0.30.216-13~3 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9c16ae134dd48636f5d4f75f97d7e4b7cb72d163;p=build.git add kernel-headers to whitelist, and only in f8 or centos5 --- diff --git a/onelab-k32-tags.mk b/onelab-k32-tags.mk index ade9f71b..967e7e7e 100644 --- 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-WHITELIST-RPMS := kernel-devel +# 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 diff --git a/planetlab-k32-tags.mk b/planetlab-k32-tags.mk index f6a3351f..0e56fe28 100644 --- a/planetlab-k32-tags.mk +++ b/planetlab-k32-tags.mk @@ -3,8 +3,10 @@ mkinitrd-GITPATH := git://git.planet-lab.org/mkinitrd.git@mkinitrd-5.1.19.6-0 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-WHITELIST-RPMS := kernel-devel +# 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.planet-lab.org/madwifi.git@madwifi-4132-2 iptables-GITPATH := git://git.planet-lab.org/iptables.git@iptables-1.4.10-2