X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=047cc9edd5df73c51a213f7453bbe7443a7f12b3;hb=2d3e77d50cfc7da8870cbadb3b18cd2516e494f3;hp=27ecf17628a53c31cd67d5ab52b98903776556c8;hpb=00c829b8272a47780efb1863407fe563b9054a69;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 27ecf176..047cc9ed 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)
@@ -187,15 +194,10 @@ IN_NODEIMAGE += plnode-utils
 #
 # nodemanager
 #
-nodemanager-lib-MODULES := nodemanager
-nodemanager-lib-SPEC := nodemanager-lib.spec
-ALL += nodemanager-lib
-IN_NODEIMAGE += nodemanager-lib
-
-nodemanager-vs-MODULES := nodemanager
-nodemanager-vs-SPEC := nodemanager-vs.spec
-ALL += nodemanager-vs
-IN_NODEIMAGE += nodemanager-vs
+nodemanager-MODULES := nodemanager
+nodemanager-SPEC := nodemanager.spec
+ALL += nodemanager
+IN_NODEIMAGE += nodemanager
 
 #
 # pl_sshd
@@ -569,13 +571,6 @@ release-RPMDATE := yes
 ALL += release
 
 ##############################
-# sfa requires python-2.7
-build_sfa=true
-ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 f12 centos5)"
-build_sfa=false
-endif
-
-ifeq "$(build_sfa)" "true"
 #
 # sfa - Slice Facility Architecture
 #
@@ -583,19 +578,3 @@ sfa-MODULES := sfa
 sfa-SPEC := sfa.spec
 ALL += sfa
 
-sface-MODULES := sface
-sface-SPEC := sface.spec
-ALL += sface
-endif
-
-##############################
-# don't build these by default, we have separate builds for that
-myslice-MODULES := myslice
-myslice-SPEC := myslice.spec
-myslice-STOCK-DEVEL-RPMS := python-django
-myslice-STOCK-DEVEL-DEBS := python-django python-django-south
-#ALL += myslice
-
-manifold-MODULES := manifold
-manifold-SPEC := manifold.spec
-#ALL += manifold