From a47655e2a7afe64f1af84ae03752b5efe7b8af51 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 5 Jan 2009 14:05:42 +0000 Subject: [PATCH] start building onelab distro --- modules.list | 2 +- onelab-tags.mk | 6 ++++-- onelab.mk | 21 ++++++++++++--------- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/modules.list b/modules.list index 026f8dc0..37d76bf9 100644 --- a/modules.list +++ b/modules.list @@ -9,7 +9,7 @@ NodeManager NodeUpdate PLCAPI PLCWWW -PLCWWW:onelab.5.0 +PLEWWW PingOfDeath VserverReference comgt diff --git a/onelab-tags.mk b/onelab-tags.mk index a0123146..854dbb65 100644 --- a/onelab-tags.mk +++ b/onelab-tags.mk @@ -7,6 +7,7 @@ nozomi-SVNPATH := http://svn.onelab.eu/nozomi/trunk comgt-SVNPATH := http://svn.onelab.eu/comgt/imports/0.3 util-vserver-SVNBRANCH := scholz util-vserver-SVNPATH := http://svn.planet-lab.org/svn/util-vserver/branches/scholz +libnl-SVNPATH := http://svn.planet-lab.org/svn/libnl/trunk util-vserver-pl-SVNPATH := http://svn.planet-lab.org/svn/util-vserver-pl/trunk NodeUpdate-SVNPATH := http://svn.planet-lab.org/svn/NodeUpdate/trunk PingOfDeath-SVNPATH := http://svn.planet-lab.org/svn/PingOfDeath/trunk @@ -19,10 +20,11 @@ pf2slice-SVNPATH := http://svn.planet-lab.org/svn/pf2slice/trunk Mom-SVNPATH := http://svn.planet-lab.org/svn/Mom/trunk iptables-SVNPATH := http://svn.planet-lab.org/svn/iptables/trunk iproute2-SVNPATH := http://svn.planet-lab.org/svn/iproute2/trunk +inotify-tools-SVNPATH := http://svn.planet-lab.org/svn/inotify-tools/trunk vsys-SVNPATH := http://svn.planet-lab.org/svn/vsys/trunk dummynet_image-SVNPATH := http://svn.planet-lab.org/svn/dummynet_image/trunk PLCAPI-SVNPATH := http://svn.planet-lab.org/svn/PLCAPI/trunk -PLCWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/trunk +PLEWWW-SVNPATH := http://svn.planet-lab.org/svn/PLEWWW/trunk Monitor-SVNPATH := http://svn.planet-lab.org/svn/Monitor/trunk nodeconfig-SVNPATH := http://svn.planet-lab.org/svn/nodeconfig/trunk BootManager-SVNPATH := http://svn.planet-lab.org/svn/BootManager/trunk @@ -30,6 +32,6 @@ pypcilib-SVNPATH := http://svn.planet-lab.org/svn/pypcilib/trunk BootCD-SVNPATH := http://svn.planet-lab.org/svn/BootCD/trunk VserverReference-SVNPATH := http://svn.planet-lab.org/svn/VserverReference/trunk BootstrapFS-SVNPATH := http://svn.planet-lab.org/svn/BootstrapFS/trunk -MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/trunk +MyPLC-SVNPATH := http://svn.planet-lab.org/svn/MyPLC/trunk # locating the right test directory - see make tests_svnpath TESTS_SVNPATH := http://svn.planet-lab.org/svn/tests/trunk diff --git a/onelab.mk b/onelab.mk index b6ee1056..c3cff816 100644 --- a/onelab.mk +++ b/onelab.mk @@ -95,6 +95,8 @@ ifeq "$(local_libnl)" "true" 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 ALL += libnl IN_BOOTSTRAPFS += libnl endif @@ -239,12 +241,12 @@ ALL += PLCAPI IN_MYPLC += PLCAPI # -# PLCWWW +# use the PLEWWW module instead # -PLCWWW-MODULES := PLCWWW -PLCWWW-SPEC := PLCWWW.spec -ALL += PLCWWW -IN_MYPLC += PLCWWW +PLEWWW-MODULES := PLEWWW +PLEWWW-SPEC := PLEWWW.spec +ALL += PLEWWW +IN_MYPLC += PLEWWW # # monitor @@ -255,11 +257,12 @@ ALL += monitor IN_BOOTSTRAPFS += monitor # -# monitor-server +# zabbix # -monitor-server-MODULES := Monitor -monitor-server-SPEC := monitor-server.spec -ALL += monitor-server +zabbix-MODULES := Monitor +zabbix-SPEC := zabbix.spec +zabbix-BUILD-FROM-SRPM := yes +ALL += zabbix # # nodeconfig -- 2.43.0