From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 22 Jan 2008 15:05:22 +0000 (+0000)
Subject: PlanetLabConf merged in the onelab codebase
X-Git-Tag: 4.2-rc2~250
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2599dc188eacb3944387c3b31e22cab96e04b6da;p=build.git

PlanetLabConf merged in the onelab codebase
---

diff --git a/onelab-tags-4.2.mk b/onelab-tags-4.2.mk
index 99ee4c99..296eb440 100644
--- a/onelab-tags-4.2.mk
+++ b/onelab-tags-4.2.mk
@@ -24,7 +24,7 @@ iptables-SVNPATH		:= http://svn.planet-lab.org/svn/iptables/tags/iptables-1.3.8-
 iproute2-SVNPATH		:= http://svn.planet-lab.org/svn/iproute2/tags/iproute-2.6.16-1
 vsys-SVNPATH			:= http://svn.planet-lab.org/svn/vsys/tags/vsys-0.7-2
 PLCAPI-SVNPATH			:= http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-4.2-0
-WWW-SVNPATH			:= http://svn.one-lab.org/new_plc_www/tags/PLCWWW-4.2-1
+WWW-SVNPATH			:= http://svn.one-lab.org/new_plc_www/tags/PLCWWW-4.2-2
 VserverReference-SVNPATH	:= http://svn.planet-lab.org/svn/VserverReference/tags/vserver-4.2-0
 BootManager-SVNPATH		:= http://svn.planet-lab.org/svn/BootManager/tags/bootmanager-3.2-2
 pypcilib-SVNPATH		:= http://svn.planet-lab.org/svn/pypcilib/tags/pypcilib-0.1-1
diff --git a/onelab.mk b/onelab.mk
index 1ebb608c..659756de 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -319,6 +319,23 @@ bootstrapfs-DEPEND-FILES := RPMS/yumgroups.xml
 ALL += bootstrapfs
 IN_MYPLC += bootstrapfs
 
+#
+# noderepo
+#
+NODEREPO_RPMS = $(foreach package,$(IN_BOOTSTRAPFS) $(IN_VSERVER),$($(package).rpms))
+noderepo.list:
+	@for rpm in $(NODEREPO_RPMS) ; do echo $rpm ; done > $@
+
+noderepo-MODULES := BootstrapFS build
+noderepo-SPEC := noderepo.spec
+noderepo-RPMBUILD := sudo bash ./rpmbuild.sh
+# package requires all regular packages
+noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
+noderepo-DEPEND-FILES := RPMS/yumgroups.xml noderepo.list
+# not yet
+#ALL += noderepo
+#IN_MYPLC += noderepo
+
 #
 # myplc : initial, chroot-based packaging
 #