From d4d3a5c0d2d44606534267ca84b1341a47219ef3 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Sat, 22 Mar 2008 16:37:07 +0000 Subject: [PATCH] fix vsys/bootstrapfs dependencies --- onelab.mk | 13 +++++++------ planetlab.mk | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/onelab.mk b/onelab.mk index 7e4dcde8..72bc3ed0 100644 --- 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 6314e1d0..355072c6 100644 --- 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 # -- 2.43.0