speed up build: trim the basic devel image, add stuff as we go

[build.git] / onelab.mk

diff --git a/onelab.mk b/onelab.mk
index 24b7261..1854b69 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -42,7 +42,7 @@ IN_BOOTSTRAPFS += $(KERNELS)
 #
 ipfwroot-MODULES := ipfw
 ipfwroot-SPEC := planetlab/ipfwroot.spec
-ipfwroot-DEPEND-DEVEL-RPMS := kernel-devel
+ipfwroot-DEPEND-DEVEL-RPMS += kernel-devel
 ipfwroot-SPECVARS = kernel_version=$(kernel.rpm-version) \
         kernel_release=$(kernel.rpm-release) \
         kernel_arch=$(kernel.rpm-arch)
@@ -62,7 +62,7 @@ ALL += ipfwslice
 madwifi-MODULES := madwifi
 madwifi-SPEC := madwifi.spec
 madwifi-BUILD-FROM-SRPM := yes
-madwifi-DEPEND-DEVEL-RPMS := kernel-devel
+madwifi-DEPEND-DEVEL-RPMS += kernel-devel
 madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
        kernel_release=$(kernel.rpm-release) \
        kernel_arch=$(kernel.rpm-arch)
@@ -74,7 +74,7 @@ IN_BOOTSTRAPFS += madwifi
 # 
 nozomi-MODULES := nozomi
 nozomi-SPEC := nozomi.spec
-nozomi-DEPEND-DEVEL-RPMS := kernel-devel
+nozomi-DEPEND-DEVEL-RPMS += kernel-devel
 nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \
        kernel_release=$(kernel.rpm-release) \
        kernel_arch=$(kernel.rpm-arch)
@@ -113,7 +113,7 @@ iptables-SPEC := iptables.spec
 ifeq "$(PLDISTROTAGS)" "onelab-k27-tags.mk"
 iptables-BUILD-FROM-SRPM := yes
 endif
-iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
+iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += iptables
 IN_BOOTSTRAPFS += iptables
 
@@ -151,7 +151,7 @@ libnl-MODULES := libnl
 libnl-SPEC := libnl.spec
 libnl-BUILD-FROM-SRPM := yes
 # this sounds like the thing to do, but in fact linux/if_vlan.h comes with kernel-headers
-libnl-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers
+libnl-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers
 ALL += libnl
 IN_BOOTSTRAPFS += libnl
 endif
@@ -161,7 +161,7 @@ endif
 #
 util-vserver-pl-MODULES := util-vserver-pl
 util-vserver-pl-SPEC := util-vserver-pl.spec
-util-vserver-pl-DEPEND-DEVEL-RPMS := util-vserver-lib util-vserver-devel util-vserver-core 
+util-vserver-pl-DEPEND-DEVEL-RPMS += util-vserver-lib util-vserver-devel util-vserver-core 
 ifeq "$(local_libnl)" "true"
 util-vserver-pl-DEPEND-DEVEL-RPMS += libnl libnl-devel
 endif
@@ -262,7 +262,7 @@ endif
 #
 openvswitch-MODULES := openvswitch
 openvswitch-SPEC := openvswitch.spec
-openvswitch-DEPEND-DEVEL-RPMS := kernel-devel
+openvswitch-DEPEND-DEVEL-RPMS += kernel-devel
 IN_BOOTSTRAPFS += openvswitch
 ALL += openvswitch
 
@@ -272,7 +272,7 @@ ALL += openvswitch
 vsys-MODULES := vsys
 vsys-SPEC := vsys.spec
 ifeq "$(local_inotify_tools)" "true"
-vsys-DEPEND-DEVEL-RPMS := inotify-tools inotify-tools-devel
+vsys-DEPEND-DEVEL-RPMS += inotify-tools inotify-tools-devel
 endif
 IN_BOOTSTRAPFS += vsys
 ALL += vsys
@@ -330,6 +330,7 @@ ALL += pcucontrol
 #
 monitor-MODULES := Monitor
 monitor-SPEC := Monitor.spec
+monitor-DEVEL-RPMS += net-snmp net-snmp-devel
 ALL += monitor
 IN_BOOTSTRAPFS += monitor
 
@@ -339,6 +340,7 @@ IN_BOOTSTRAPFS += monitor
 zabbix-MODULES := Monitor
 zabbix-SPEC := zabbix.spec
 zabbix-BUILD-FROM-SRPM := yes
+zabbix-DEVEL-RPMS += python-cherrypy
 ALL += zabbix
 
 #
@@ -370,6 +372,7 @@ ALL += pyaspects
 ejabberd-MODULES := ejabberd
 ejabberd-SPEC := ejabberd.spec
 ejabberd-BUILD-FROM-SRPM := yes
+ejabberd-DEVEL-RPMS += erlang pam-devel hevea
 # not needed anymore on f12 and above, that come with 2.1.5, and we had 2.1.3
 # so, this is relevant on f8 and centos5 only
 ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"