From: Thierry Parmentelat Date: Tue, 25 Jan 2011 14:04:33 +0000 (+0100) Subject: speed up build: trim the basic devel image, add stuff as we go X-Git-Tag: 5.0-rc18~50^2~1 X-Git-Url: http://git.onelab.eu/?p=build.git;a=commitdiff_plain;h=646cb3a3cac85535c4dad844c94f478a2d01b037 speed up build: trim the basic devel image, add stuff as we go --- diff --git a/config.planetlab/devel.pkgs b/config.planetlab/devel.pkgs index 8a4110ea..33e6032c 100644 --- a/config.planetlab/devel.pkgs +++ b/config.planetlab/devel.pkgs @@ -55,9 +55,9 @@ package: binutils-devel package: linuxdoc-tools package: sudo package: yum createrepo -# mysql -package: gperf -package: time +## mysql +#package: gperf +#package: time # bootmanager package: sharutils # bootcd @@ -86,7 +86,7 @@ package: pciutils-devel package: python-simplejson ########## # for vsys - same as for php-devel above -package: ocaml.@arch@ ocaml-ocamldoc ocaml-docs +package: ocaml.@arch@ ocaml-ocamldoc # use local inotify-tools on centos package>=f8:inotify-tools-devel ########## @@ -98,9 +98,7 @@ package: ctags package>=f12: e2fsprogs-devel package>=f14: e2fsprogs nss-devel # zabbix/monitor -package: net-snmp net-snmp-devel package=centos5: krb5-devel.@arch@ e2fsprogs-devel.@arch@ libidn-devel.@arch@ -package: python-cherrypy ########## # for sfa : rebuilding wsdl index at build-time package: python-uuid pyOpenSSL m2crypto @@ -112,9 +110,3 @@ package: python-dateutil package: python-lxml # DistributedRateLimiting package: libxml2-devel -# for ejabberd -package: erlang -package: pam-devel -package: hevea -# for mkinitrd -package=centos5: parted-devel glib2-devel libdhcp4client-devel libdhcp6client-devel libdhcp-devel device-mapper libselinux-devel libsepol-devel libnl-devel diff --git a/onelab.mk b/onelab.mk index 24b7261b..1854b692 100644 --- 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)" diff --git a/planetlab.mk b/planetlab.mk index d4ac7f06..f14c47a6 100644 --- a/planetlab.mk +++ b/planetlab.mk @@ -1,5 +1,3 @@ -# $Id$ -# $URL$ # # declare the packages to be built and their dependencies # initial version from Mark Huang @@ -17,6 +15,8 @@ ifeq "$(DISTRONAME)" "centos5" mkinitrd-MODULES := mkinitrd mkinitrd-SPEC := mkinitrd.spec mkinitrd-BUILD-FROM-SRPM := yes +mkinitrd-DEVEL-RPMS += parted-devel glib2-devel libdhcp4client-devel libdhcp6client-devel libdhcp-devel +mkinitrd-DEVEL-RPMS += device-mapper libselinux-devel libsepol-devel libnl-devel ALL += mkinitrd IN_BOOTCD += mkinitrd IN_VSERVER += mkinitrd @@ -61,7 +61,7 @@ ifneq "$(DISTRONAME)" "f8" 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) @@ -94,7 +94,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 @@ -104,7 +104,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 @@ -187,7 +187,7 @@ IN_BOOTSTRAPFS += mom # iptables-MODULES := iptables iptables-SPEC := iptables.spec -iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers +iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers ALL += iptables IN_BOOTSTRAPFS += iptables @@ -232,7 +232,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 @@ -290,6 +290,7 @@ ALL += pcucontrol # monitor-MODULES := Monitor monitor-SPEC := Monitor.spec +monitor-DEVEL-RPMS += net-snmp net-snmp-devel ALL += monitor IN_BOOTSTRAPFS += monitor @@ -306,6 +307,7 @@ ALL += plcrt zabbix-MODULES := Monitor zabbix-SPEC := zabbix.spec zabbix-BUILD-FROM-SRPM := yes +zabbix-DEVEL-RPMS += python-cherrypy ALL += zabbix # @@ -331,6 +333,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)"