take util-vserver out of our scope

[build.git] / onelab.mk

diff --git a/onelab.mk b/onelab.mk
index 7bdebd7..159d60f 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -41,8 +41,7 @@ IN_MYPLC += $(KERNELS)
 #
 # kexec-tools
 #
-ifeq "$(DISTRO)" "Fedora"
-ifeq "$(RELEASE)" "4"
+ifeq "$(DISTRONAME)" "fc4"
 kexec-tools-MODULES := kexec-tools
 kexec-tools-SPEC := kexec-tools.spec
 kexec-tools-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
@@ -50,7 +49,6 @@ kexec-tools-TAG := planetlab-4_1-rc2
 ALL += kexec-tools
 IN_BOOTCD += kexec-tools
 endif
-endif
 
 #
 # madwifi
@@ -246,17 +244,24 @@ IN_BOOTSTRAPFS += iproute
 #
 # vsys
 #
+vsys_support=yes
+ifeq "$(DISTRONAME)" "fc4"
+vsys_support=
+endif
+ifeq "$(DISTRONAME)" "fc6"
+vsys_support=
+endif
+# cannot find the required packages (see devel.pkgs) on centos5
+ifeq "$(DISTRONAME)" "centos5"
+vsys_support=
+endif
+
+ifeq "$(vsys_support)" "yes"
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
 IN_BOOTSTRAPFS += vsys
-ifeq "$(DISTRO)" "Fedora"
-ifeq "$(RELEASE)" "7"
-ALL += vsys
-endif
-ifeq "$(RELEASE)" "8"
 ALL += vsys
 endif
-endif
 
 #
 # PLCAPI
@@ -341,7 +346,7 @@ IN_MYPLC += bootstrapfs
 #
 # all rpms resulting from packages marked as being in bootstrapfs and vserver
 NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms))
-# replace space with +++
+# replace space with +++ (specvars cannot deal with spaces)
 SPACE=$(subst x, ,x)
 NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
 
@@ -351,10 +356,10 @@ noderepo-RPMBUILD := sudo bash ./rpmbuild.sh
 # package requires all regular packages
 noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
 noderepo-DEPEND-FILES := RPMS/yumgroups.xml
+#export rpm list to the specfile
 noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
-# not yet
 ALL += noderepo
-#IN_MYPLC += noderepo
+IN_MYPLC += noderepo
 
 #
 # myplc : initial, chroot-based packaging