From ecd86f30d35acced46d4332f789a96060ca61a9c Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 4 Oct 2013 09:19:41 +0200 Subject: [PATCH] cleanup, kernel deps do not belong in the tags file anymore --- onelab-tags.mk | 6 ------ onelab.mk | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/onelab-tags.mk b/onelab-tags.mk index ae01bbef..11408bc8 100644 --- 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 27ecf176..565163c2 100644 --- 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) -- 2.43.0