From 8bdb0364c69a1f91026c5451cb17ca1e337c40dd Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 26 Jan 2011 13:09:36 +0100 Subject: [PATCH] catching up again --- wextoolbox-tags.mk | 21 +++--- wextoolbox.mk | 170 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 140 insertions(+), 51 deletions(-) diff --git a/wextoolbox-tags.mk b/wextoolbox-tags.mk index 37d32d1..a44c8a2 100644 --- a/wextoolbox-tags.mk +++ b/wextoolbox-tags.mk @@ -8,8 +8,11 @@ spectools-GITPATH := git://git.onelab.eu/spectools@spectools-2009_06_R1-1 #sge-GITPATH := git://git.onelab.eu/sge/tags/sge-6.2.3-1 #sge-GITPATH := git://git.onelab.eu/sge/trunk +### linux-2.6-BRANCH := rhel6 -linux-2.6-GITPATH := git://git.onelab.eu/linux-2.6.git@rhel6 +linux-2.6-GITPATH := git://git.planet-lab.org/linux-2.6.git@linux-2.6-32-10 +# spec2make does not know how to interpret that +#kernel-RPMFLAGS += --without debug kernel-DEVEL-RPMS += elfutils-libelf-devel madwifi-GITPATH := git://git.onelab.eu/madwifi.git@madwifi-4132-2 iptables-BUILD-FROM-SRPM := yes # tmp @@ -18,8 +21,10 @@ iproute-BUILD-FROM-SRPM := yes iproute2-GITPATH := git://git.onelab.eu/iproute2.git@iproute2-2.6.35-0 ### ipfw-GITPATH := git://git.onelab.eu/ipfw.git@ipfw-0.9-20 +### +#comgt-SVNPATH := http://svn.onelab.eu/comgt/imports/0.3 planetlab-umts-tools-GITPATH := git://git.onelab.eu/planetlab-umts-tools.git@planetlab-umts-tools-0.6-6 - +### util-vserver-BUILD-FROM-SRPM := yes # tmp util-vserver-GITPATH := git://git.onelab.eu/util-vserver.git@util-vserver-0.30.216-11 libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 @@ -27,7 +32,7 @@ libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2 util-vserver-pl-GITPATH := git://git.onelab.eu/util-vserver-pl.git@util-vserver-pl-0.4-21 nodeupdate-GITPATH := git://git.onelab.eu/nodeupdate.git@NodeUpdate-0.5-6 PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1 -nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-25 +nodemanager-GITPATH := git://git.onelab.eu/nodemanager.git@nodemanager-2.0-26 pl_sshd-SVNPATH := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11 codemux-GITPATH := git://git.onelab.eu/codemux.git@codemux-0.1-15 fprobe-ulog-SVNPATH := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2 @@ -43,10 +48,11 @@ plewww-GITPATH := git://git.onelab.eu/plewww.git@plewww-4.3-58 www-register-wizard-SVNPATH := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-5 pcucontrol-GITPATH := git://git.onelab.eu/pcucontrol.git@pcucontrol-1.0-10 Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/tags/Monitor-3.0-35 -#PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11 +PLCRT-SVNPATH := http://svn.planet-lab.org/svn/PLCRT/tags/PLCRT-1.0-11 pyopenssl-SVNPATH := http://svn.planet-lab.org/svn/pyopenssl/tags/pyopenssl-0.9-1 ### pyaspects-GITPATH := git://git.onelab.eu/pyaspects.git@pyaspects-0.4.1-1 +#ejabberd-GITPATH := git://git.onelab.eu/ejabberd.git@ejabberd-2.1.6-2 omf-GITPATH := git://git.onelab.eu/omf.git@omf-5.3-9 ### #sfa-GITPATH := git://git.onelab.eu/sfa.git@master @@ -55,18 +61,15 @@ nodeconfig-GITPATH := git://git.onelab.eu/nodeconfig.git@nodeconfig bootmanager-GITPATH := git://git.onelab.eu/bootmanager.git@bootmanager-5.0-16 pypcilib-GITPATH := git://git.onelab.eu/pypcilib.git@pypcilib-0.2-9 pyplnet-GITPATH := git://git.onelab.eu/pyplnet.git@pyplnet-4.3-8 -bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.0-7 +bootcd-GITPATH := git://git.onelab.eu/bootcd.git@bootcd-5.0-8 vserver-reference-GITPATH := git://git.onelab.eu/vserver-reference.git@vserver-reference-5.0-6 -bootstrapfs-GITPATH := git://git.onelab.eu/bootstrapfs.git@bootstrapfs-2.0-7 +bootstrapfs-GITPATH := git://git.onelab.eu/bootstrapfs.git@master myplc-GITPATH := git://git.onelab.eu/myplc.git@master #DistributedRateLimiting-SVNPATH := http://svn.planet-lab.org/svn/DistributedRateLimiting/tags/DistributedRateLimiting-0.1-1 # locating the right test directory - see make tests_gitpath tests-GITPATH := git://git.onelab.eu/tests.git@master -# locating the right test directory - see make tests_svnpath -tests-GITPATH := git://git.onelab.eu/tests@master - ### temporary # nozomi not needed anymore for 2.6.27 ALL:=$(subst nozomi,,$(ALL)) diff --git a/wextoolbox.mk b/wextoolbox.mk index e6e5960..38d33f8 100644 --- a/wextoolbox.mk +++ b/wextoolbox.mk @@ -121,48 +121,17 @@ IN_BOOTCD += $(KERNELS) IN_VSERVER += $(KERNELS) IN_BOOTSTRAPFS += $(KERNELS) -# -# madwifi -# -madwifi-MODULES := madwifi -madwifi-SPEC := madwifi.spec -madwifi-BUILD-FROM-SRPM := yes -madwifi-DEPEND-DEVEL-RPMS := kernel-devel -madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \ - kernel_release=$(kernel.rpm-release) \ - kernel_arch=$(kernel.rpm-arch) -ALL += madwifi -IN_BOOTSTRAPFS += madwifi - -# -# iptables -# -iptables-MODULES := iptables -iptables-SPEC := iptables.spec -iptables-DEPEND-DEVEL-RPMS := kernel-devel kernel-headers -ALL += iptables -IN_BOOTSTRAPFS += iptables - -# -# iproute -# -iproute-MODULES := iproute2 -iproute-SPEC := iproute.spec -ALL += iproute -IN_BOOTSTRAPFS += iproute -IN_VSERVER += iproute -IN_BOOTCD += iproute - # # ipfw: root context module, and slice companion # 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) ALL += ipfwroot +IN_BOOTSTRAPFS += ipfwroot ipfwslice-MODULES := ipfw ipfwslice-SPEC := planetlab/ipfwslice.spec @@ -171,6 +140,39 @@ ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \ kernel_arch=$(kernel.rpm-arch) ALL += ipfwslice +# +# madwifi +# +madwifi-MODULES := madwifi +madwifi-SPEC := madwifi.spec +madwifi-BUILD-FROM-SRPM := yes +madwifi-DEPEND-DEVEL-RPMS += kernel-devel +madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \ + kernel_release=$(kernel.rpm-release) \ + kernel_arch=$(kernel.rpm-arch) +ALL += madwifi +IN_BOOTSTRAPFS += madwifi + +### # +### # 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 + # # umts: root context stuff # @@ -187,6 +189,25 @@ umts-frontend-SPEC := frontend.spec IN_VSERVER += umts-frontend ALL += umts-frontend +# +# iptables +# +iptables-MODULES := iptables +iptables-SPEC := iptables.spec +iptables-DEPEND-DEVEL-RPMS += kernel-devel kernel-headers +ALL += iptables +IN_BOOTSTRAPFS += iptables + +# +# iproute +# +iproute-MODULES := iproute2 +iproute-SPEC := iproute.spec +ALL += iproute +IN_BOOTSTRAPFS += iproute +IN_VSERVER += iproute +IN_BOOTCD += iproute + # # util-vserver # @@ -211,7 +232,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 @@ -221,7 +242,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 @@ -276,6 +297,15 @@ fprobe-ulog-SPEC := fprobe-ulog.spec ALL += fprobe-ulog IN_BOOTSTRAPFS += fprobe-ulog +### # +### # DistributedRateLimiting +### # +### DistributedRateLimiting-MODULES := DistributedRateLimiting +### DistributedRateLimiting-SPEC := DistributedRateLimiting.spec +### ALL += DistributedRateLimiting +### IN_NODEREPO += DistributedRateLimiting + + # # pf2slice # @@ -308,14 +338,23 @@ IN_BOOTSTRAPFS += inotify-tools ALL += inotify-tools endif +### # +### # openvswitch +### # +### openvswitch-MODULES := openvswitch +### openvswitch-SPEC := openvswitch.spec +### openvswitch-DEPEND-DEVEL-RPMS += kernel-devel +### IN_BOOTSTRAPFS += openvswitch +### ALL += openvswitch + # # vsys # vsys-MODULES := vsys vsys-SPEC := vsys.spec -vsys-DEVEL-RPMS += ocaml-docs ocaml-ocamldoc +vsys-DEVEL-RPMS += ocaml-ocamldoc 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 @@ -329,7 +368,7 @@ IN_BOOTSTRAPFS += vsys-scripts ALL += vsys-scripts # -# PLCAPI +# plcapi # plcapi-MODULES := plcapi plcapi-SPEC := PLCAPI.spec @@ -409,6 +448,38 @@ pyaspects-SPEC := pyaspects.spec pyaspects-BUILD-FROM-SRPM := yes ALL += pyaspects +### # +### # ejabberd +### # +### 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)" +### ALL += ejabberd +### endif + +### # sfa now uses the with statement that's not supported on python-2.4 - not even through __future__ +### build_sfa=true +### ifeq "$(DISTRONAME)" "centos5" +### build_sfa=false +### endif + +### ifeq "$(build_sfa)" "true" +### # +### # sfa - Slice Facility Architecture +### # +### sfa-MODULES := sfa +### sfa-SPEC := sfa.spec +### ALL += sfa +### endif + +### sface-MODULES := sface +### sface-SPEC := sface.spec +### ALL += sface + # # nodeconfig # @@ -443,6 +514,21 @@ IN_BOOTSTRAPFS += pyplnet IN_MYPLC += pyplnet IN_BOOTCD += pyplnet +### # +### # OMF resource controller +### # +### omf-resctl-MODULES := omf +### omf-resctl-SPEC := omf-resctl.spec +### ALL += omf-resctl +### IN_VSERVER += omf-resctl + +### # +### # OMF exp controller +### # +### omf-expctl-MODULES := omf +### omf-expctl-SPEC := omf-expctl.spec +### ALL += omf-expctl + # # bootcd # @@ -480,15 +566,15 @@ IN_MYPLC += bootstrapfs # noderepo # # all rpms resulting from packages marked as being in bootstrapfs and vserver -NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms)) +NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER),$($(package).rpms)) # replace space with +++ (specvars cannot deal with spaces) SPACE=$(subst x, ,x) NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS)) -noderepo-MODULES := bootstrapfs +noderepo-MODULES := bootstrapfs noderepo-SPEC := noderepo.spec -# package requires all regular packages -noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER) +# package requires all embedded packages +noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_NODEREPO) $(IN_VSERVER) noderepo-DEPEND-FILES := RPMS/yumgroups.xml #export rpm list to the specfile noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS) -- 2.43.0