From 1b393f8947177108a61d2ab25e47281b3507076b Mon Sep 17 00:00:00 2001 From: thierry Date: Mon, 5 Oct 2009 09:33:51 +0000 Subject: [PATCH] set of components close to the one in pl27, as otherwise some deps to monitor are failing --- gnuradio-tags.mk | 11 +++-- gnuradio.mk | 112 +++++++++++++++++++++++++++++------------------ 2 files changed, 76 insertions(+), 47 deletions(-) diff --git a/gnuradio-tags.mk b/gnuradio-tags.mk index 3cbaba1..6719bf3 100644 --- a/gnuradio-tags.mk +++ b/gnuradio-tags.mk @@ -12,7 +12,7 @@ util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/tags/u NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-5 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 NodeManager-SVNPATH := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.8-13 -pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-3 +pyplnet-SVNPATH := http://svn.planet-lab.org/svn/pyplnet/tags/pyplnet-4.3-4 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 CoDemux-SVNPATH := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-13 fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-0 @@ -24,7 +24,7 @@ inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti vsys-SVNBRANCH := 0.9 vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-3 vsys-scripts-SVNPATH := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-8 -PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-24 +PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.3-25 drupal-SVNPATH := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13 PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/tags/PLEWWW-4.3-29 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-1 @@ -35,7 +35,10 @@ pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-8 BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-4.2-15 VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/tags/VserverReference-4.2-13 BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-1.0-8 -MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-24 +MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/tags/MyPLC-4.3-24 +sfa-SVNPATH := http://svn.planet-lab.org/svn/sfa/tags/sfa-0.9-3 +pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1 +PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-10 # locating the right test directory - see make tests_svnpath -TESTS_SVNPATH := http://svn.planet-lab.org/svn/tests/tags/tests-4.3-1 +TESTS_SVNPATH := http://svn.planet-lab.org/svn/tests/tags/tests-4.3-3 diff --git a/gnuradio.mk b/gnuradio.mk index fae014a..37b15e4 100644 --- a/gnuradio.mk +++ b/gnuradio.mk @@ -6,6 +6,18 @@ # rewritten by Thierry Parmentelat - INRIA Sophia Antipolis # # $Id$ +# +### NOTES on diffs with onelab +# 2.6.27 vs 2.6.22 - does not need iwlwifi exception anymore +# does not include: +# ipfw (might just work) - svn:ipfw +# ipfwslice - svn:ipfw +# nozomi (does not work on 2.6.27) svn:nozomi +# comgt - svn:comgt +# umts-backend - svn:planetlab-umts-tools +# umts-frontend - svn:planetlab-umts-tools +# dummynet_image - svn:dummynet_image + # # see doc in Makefile # @@ -25,18 +37,22 @@ kernel-RPMFLAGS:= --target i686 else kernel-RPMFLAGS:= --target $(HOSTARCH) endif -### # 2.6.27 not yet ready for this -#kernel-SPECVARS := iwlwifi=1 +### not needed with 2.6.27 anymore +### kernel-SPECVARS := iwlwifi=1 ### tmp kernel-RPMDATE := yes -ALL += kernel +KERNELS += kernel + +kernels: $(KERNELS) +kernels-clean: $(foreach package,$(KERNELS),$(package)-clean) +ALL += $(KERNELS) # this is to mark on which image a given rpm is supposed to go -IN_BOOTCD += kernel -IN_VSERVER += kernel -IN_BOOTSTRAPFS += kernel +IN_BOOTCD += $(KERNELS) +IN_VSERVER += $(KERNELS) +IN_BOOTSTRAPFS += $(KERNELS) # turns out myplc installs kernel-vserver -IN_MYPLC += kernel +IN_MYPLC += $(KERNELS) # # madwifi @@ -51,27 +67,6 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \ ALL += madwifi IN_BOOTSTRAPFS += madwifi -### # 2.6.27 not yet ready for this -### # -### # nozomi -### # -### nozomi-MODULES := nozomi -### nozomi-SPEC := nozomi.spec -### nozomi-DEPEND-DEVEL-RPMS := kernel-devel -### nozomi-SPECVARS = kernel_version=$(kernel.rpm-version) \ -### kernel_release=$(kernel.rpm-release) \ -### kernel_arch=$(kernel.rpm-arch) -### IN_BOOTSTRAPFS += nozomi -### ALL += nozomi -### -### # -### # comgt -### # -### comgt-MODULES := comgt -### comgt-SPEC := comgt.spec -### IN_BOOTSTRAPFS += comgt -### ALL += comgt - # # util-vserver # @@ -224,6 +219,14 @@ endif IN_BOOTSTRAPFS += vsys ALL += vsys +# +# vsys-scripts +# +vsys-scripts-MODULES := vsys-scripts +vsys-scripts-SPEC := vsys-scripts.spec +IN_BOOTSTRAPFS += vsys-scripts +ALL += vsys-scripts + # # PLCAPI # @@ -257,21 +260,44 @@ www-register-wizard-SPEC := www-register-wizard.spec ALL += www-register-wizard IN_MYPLC += www-register-wizard -### # -### # monitor -### # -### monitor-MODULES := Monitor -### monitor-SPEC := Monitor.spec -### ALL += monitor -### IN_BOOTSTRAPFS += monitor -### -### # -### # zabbix -### # -### zabbix-MODULES := Monitor -### zabbix-SPEC := zabbix.spec -### zabbix-BUILD-FROM-SRPM := yes -### ALL += zabbix +# +# monitor +# +monitor-MODULES := Monitor +monitor-SPEC := Monitor.spec +ALL += monitor +IN_BOOTSTRAPFS += monitor + +# +# PLC RT +# +plcrt-MODULES := PLCRT +plcrt-SPEC := plcrt.spec +ALL += plcrt + +# +# zabbix +# +zabbix-MODULES := Monitor +zabbix-SPEC := zabbix.spec +zabbix-BUILD-FROM-SRPM := yes +ALL += zabbix + +# +# pyopenssl +# +pyopenssl-MODULES := pyopenssl +pyopenssl-SPEC := pyOpenSSL.spec +pyopenssl-BUILD-FROM-SRPM := yes +ALL += pyopenssl + + +# +# sfa - Slice Facility Architecture +# +sfa-MODULES := sfa +sfa-SPEC := sfa.spec +ALL += sfa # # nodeconfig -- 2.43.0