fix vsys/bootstrapfs dependencies

diff --git a/onelab.mk b/onelab.mk
index 7e4dcde..72bc3ed 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
@@ -248,14 +246,17 @@ IN_BOOTSTRAPFS += iproute
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
+ifeq "$(DISTRONAME)" "f7"
 IN_BOOTSTRAPFS += vsys
-ifeq "$(DISTRO)" "Fedora"
-ifeq "$(RELEASE)" "7"
 ALL += vsys
 endif
-ifeq "$(RELEASE)" "8"
+ifeq "$(DISTRONAME)" "f8"
+IN_BOOTSTRAPFS += vsys
 ALL += vsys
 endif
+ifeq "$(DISTRONAME)" "centos5"
+IN_BOOTSTRAPFS += vsys
+ALL += vsys
 endif
 
 #

diff --git a/planetlab.mk b/planetlab.mk
index 6314e1d..355072c 100644 (file)
--- a/planetlab.mk
+++ b/planetlab.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
@@ -227,14 +225,17 @@ IN_BOOTSTRAPFS += iproute
 #
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
+ifeq "$(DISTRONAME)" "f7"
 IN_BOOTSTRAPFS += vsys
-ifeq "$(DISTRO)" "Fedora"
-ifeq "$(RELEASE)" "7"
 ALL += vsys
 endif
-ifeq "$(RELEASE)" "8"
+ifeq "$(DISTRONAME)" "f8"
+IN_BOOTSTRAPFS += vsys
 ALL += vsys
 endif
+ifeq "$(DISTRONAME)" "centos5"
+IN_BOOTSTRAPFS += vsys
+ALL += vsys
 endif
 
 #