git://git.onelab.eu / build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 596a347)
tags files reviewed for mentions of the actual branch used
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 9 Apr 2008 11:34:58 +0000 (11:34 +0000)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 9 Apr 2008 11:34:58 +0000 (11:34 +0000)
make supports utility targets for fast checking, like in
  make PLDISTROTAGS=onelab-tags-4.2.mk stage1=true packages modules branches
modules.update allows to refresh modules.list

Makefile patch | blob | history
modules.list patch | blob | history
modules.update [new file with mode: 0755] patch | blob
onelab-tags-4.2.mk patch | blob | history
planetlab-tags-4.2.mk patch | blob | history
planetlab-tags.mk patch | blob | history

diff --git a/Makefile b/Makefile
index 04f5c47..a865858 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,8 @@ PLANETLAB_RELEASE = 4.2
 #
 # Default values
 #
-HOSTARCH := $(shell uname -i)
+# minimal compat with macos, just so this does not complain 
+HOSTARCH := $(shell uname -i 2> /dev/null || uname -m 2> /dev/null)
 DISTRO := $(shell ./getdistro.sh)
 RELEASE := $(shell ./getrelease.sh)
 DISTRONAME := $(shell ./getdistroname.sh)
@@ -642,6 +643,37 @@ endif
 # only if present
 -include $(PLDISTROINSTALL)
 
+#################### package info
+PKGKEYS := tarballs source codebase srpm rpms rpmnames rpm-release rpm-name rpm-version rpm-subversion
+%-pkginfo: package=$(subst -pkginfo,,$@)
+%-pkginfo: 
+       @$(foreach key,$(PKGKEYS),echo "$(package).$(key)=$($(package).$(key))";)
+## rpm info
+RPMKEYS := rpm-path package
+%-rpminfo: rpm=$(subst -rpminfo,,$@)
+%-rpminfo: 
+       @$(foreach key,$(RPMKEYS),echo "$(rpm).$(key)=$($(rpm).$(key))";)
+
+#################### various lists - designed to run with stage1=true
+packages:
+       @$(foreach package,$(ALL), echo package=$(package) ref_module=$($(package).module) modules=$($(package)-MODULES); )
+
+modules:
+       @$(foreach module,$(ALL-MODULES), echo modules=$(module) svnpath=$($(module)-SVNPATH); )
+
+branches:
+       @$(foreach module,$(ALL-MODULES), \
+         $(if $($(module)-SVNBRANCH),echo module=$(module) branch=$($(module)-SVNBRANCH);))
+
+module-tools:
+       @$(foreach module,$(ALL-MODULES), \
+         echo $(module); \
+         $(if $($(module)-SVNBRANCH),echo $(module):$($(module)-SVNBRANCH);))
+
+info: packages modules branches 
+
+.PHONY: info packages modules branches module-tools
+
 ####################
 help:
        @echo "********** Run make in two stages:"
@@ -720,13 +752,3 @@ help:
 +%: varname=$(subst +,,$@)
 +%:
        @echo "$($(varname))"
-## package info
-PKGKEYS := tarballs source codebase srpm rpms rpmnames rpm-release rpm-name rpm-version rpm-subversion
-%-pkginfo: package=$(subst -pkginfo,,$@)
-%-pkginfo: 
-       @$(foreach key,$(PKGKEYS),echo "$(package).$(key)=$($(package).$(key))";)
-## rpm info
-RPMKEYS := rpm-path package
-%-rpminfo: rpm=$(subst -rpminfo,,$@)
-%-rpminfo: 
-       @$(foreach key,$(RPMKEYS),echo "$(rpm).$(key)=$($(rpm).$(key))";)
diff --git a/modules.list b/modules.list
index b19fc76..4d92ad6 100644 (file)
--- a/modules.list
+++ b/modules.list
@@ -2,34 +2,34 @@ BootCD
 BootManager
 BootstrapFS
 CoDemux
-# 4.2
+Mom
 Mom:2.2
+Monitor
 MyPLC
-# 4.2
+NodeManager
 NodeManager:1.7
 NodeUpdate
 PLCAPI
+PLCWWW
+PLCWWW:onelab.4.2
 PingOfDeath
 PlanetFlow
 VserverReference
-PLCWWW
-nodeconfig
+build
 fprobe-ulog
 iproute2
 iptables
+kexec-tools
 libhttpd++
 libnl
-linux-2.6
+linux-patches
 madwifi
+nodeconfig
 pf2slice
 pl_sshd
-# not used during build - taking out
-#plcmdline
 proper
 pypcilib
 ulogd
-util-python
-util-vserver:scholz
+util-vserver
 util-vserver-pl
-vsys
 wireless-tools
diff --git a/modules.update b/modules.update
new file mode 100755 (executable)
index 0000000..56e3a6c
--- /dev/null
+++ b/modules.update
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# redirect this into modules.list to get it refreshed
+
+for tags in *tags*mk ; do make stage1=true PLDISTROTAGS=$tags module-tools ; done | sort -u
diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk
index 3829095..2417f96 100644 (file)
--- a/onelab-tags-4.2.mk
+++ b/onelab-tags-4.2.mk
@@ -1,7 +1,10 @@
 # $Id$
 
+# SVNBRANCH specifications are not used at build-time, 
+# but by modules.update to refresh modules.list 
+# that serves as the default for module-tools -a
+
 build-SVNPATH                  := http://svn.planet-lab.org/svn/build/trunk
-# not stable yet
 linux-patches-SVNPATH          := http://svn.planet-lab.org/svn/linux-2.6/trunk
 madwifi-SVNPATH                        := http://svn.planet-lab.org/svn/madwifi/tags/madwifi-0.9.3.3-1
 wireless-tools-SVNPATH         := http://svn.planet-lab.org/svn/wireless-tools/tags/wireless-tools-29-0
@@ -9,31 +12,26 @@ nozomi-SVNPATH                       := http://svn.one-lab.org/nozomi/tags/nozomi-2.21-1
 comgt-SVNPATH                  := http://svn.one-lab.org/comgt/imports/0.3
 libnl-SVNPATH                  := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.0-11
 util-vserver-SVNPATH           := http://svn.planet-lab.org/svn/util-vserver/tags/util-vserver-0.30.215-2
-# not stable yet
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/trunk
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-2
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
+NodeManager-SVNBRANCH          := 1.7
 NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.7-5
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-10
 libhttpd++-SVNPATH             := http://svn.planet-lab.org/svn/libhttpd++/tags/libhttpd++-0.1.4-1
 proper-SVNPATH                 := http://svn.planet-lab.org/svn/proper/tags/proper-0.3-37
-# not stable yet
 CoDemux-SVNPATH                        := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-9
 ulogd-SVNPATH                  := http://svn.planet-lab.org/svn/ulogd/tags/ulogd-1.24-4
-# not stable yet
 fprobe-ulog-SVNPATH            := http://svn.planet-lab.org/svn/fprobe-ulog/trunk
-# not stable yet
 pf2slice-SVNPATH                := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-1
 PlanetFlow-SVNPATH             := http://svn.planet-lab.org/svn/PlanetFlow/tags/PlanetFlow-4.0-3
-Mom-branch                     := 2.2
+Mom-SVNBRANCH                  := 2.2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.2-3
-# not stable yet
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/trunk
 iproute2-SVNPATH               := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16-1
-# not stable yet
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/trunk
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.2-4
-PLCWWW-branch                  := onelab.4.2
+PLCWWW-SVNBRANCH               := onelab.4.2
 PLCWWW-SVNPATH                 := http://svn.planet-lab.org/svn/PLCWWW/tags/PLCWWW-onelab.4.2-8
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.2-3
 BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-3.2-5
diff --git a/planetlab-tags-4.2.mk b/planetlab-tags-4.2.mk
index 85fc77a..8d7252f 100644 (file)
--- a/planetlab-tags-4.2.mk
+++ b/planetlab-tags-4.2.mk
@@ -11,6 +11,7 @@ util-vserver-SVNPATH          := http://svn.planet-lab.org/svn/util-vserver/tags/util-vs
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/trunk
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-2
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
+NodeManager-SVNBRANCH          := 1.7
 NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-1.7-5
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-10
 libhttpd++-SVNPATH             := http://svn.planet-lab.org/svn/libhttpd++/tags/libhttpd++-0.1.4-1
@@ -22,7 +23,7 @@ fprobe-ulog-SVNPATH           := http://svn.planet-lab.org/svn/fprobe-ulog/trunk
 # not stable yet
 pf2slice-SVNPATH                := http://svn.planet-lab.org/svn/pf2slice/tags/pf2slice-1.0-1
 PlanetFlow-SVNPATH             := http://svn.planet-lab.org/svn/PlanetFlow/tags/PlanetFlow-4.0-3
-Mom-branch                     := 2.2
+Mom-SVNBRANCH                  := 2.2
 Mom-SVNPATH                    := http://svn.planet-lab.org/svn/Mom/tags/Mom-2.2-3
 # not stable yet
 iptables-SVNPATH               := http://svn.planet-lab.org/svn/iptables/trunk
@@ -31,6 +32,8 @@ iproute2-SVNPATH              := http://svn.planet-lab.org/svn/iproute2/tags/iproute2-2.6.16
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/trunk
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.2-4
 PLCWWW-SVNPATH                 := http://svn.planet-lab.org/svn/PLCWWW/tags/PLCWWW-4.2-1
+# not yet built
+#Monitor-SVNPATH                       := http://svn.planet-lab.org/svn/Monitor/trunk
 nodeconfig-SVNPATH             := http://svn.planet-lab.org/svn/nodeconfig/tags/nodeconfig-4.2-3
 BootManager-SVNPATH            := http://svn.planet-lab.org/svn/BootManager/tags/BootManager-3.2-5
 pypcilib-SVNPATH               := http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.2-1
diff --git a/planetlab-tags.mk b/planetlab-tags.mk
index 1375eb5..86c6380 100644 (file)
--- a/planetlab-tags.mk
+++ b/planetlab-tags.mk
@@ -24,6 +24,7 @@ iproute2-SVNPATH              := http://svn.planet-lab.org/svn/iproute2/trunk
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/trunk
 PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/trunk
 PLCWWW-SVNPATH                 := http://svn.planet-lab.org/svn/PLCWWW/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
 pypcilib-SVNPATH               := http://svn.planet-lab.org/svn/pypcilib/trunk
@@ -31,4 +32,3 @@ 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
-Monitor-SVNPATH                        := http://svn.planet-lab.org/svn/Monitor/trunk
build