first draft of the slicerepo

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 9364c59..5c33e7b 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -44,7 +44,7 @@ omf-SVNPATH                   := http://svn.planet-lab.org/svn/omf/trunk
 #
 BootCD-SVNPATH                  := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-5.0-1
 VserverReference-SVNPATH        := http://svn.planet-lab.org/svn/VserverReference/trunk
-BootstrapFS-SVNPATH             := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-2.0-1
+BootstrapFS-SVNPATH             := http://svn.planet-lab.org/svn/BootstrapFS/trunk
 MyPLC-SVNPATH                   := http://svn.planet-lab.org/svn/MyPLC/trunk
 
 # locating the right test directory - see make tests_svnpath

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 7218bbf..4a79883 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -48,7 +48,7 @@ omf-SVNPATH                   := http://svn.planet-lab.org/svn/omf/trunk
 #
 BootCD-SVNPATH                  := http://svn.planet-lab.org/svn/BootCD/tags/BootCD-5.0-1
 VserverReference-SVNPATH       := http://svn.planet-lab.org/svn/VserverReference/trunk
-BootstrapFS-SVNPATH             := http://svn.planet-lab.org/svn/BootstrapFS/tags/BootstrapFS-2.0-1
+BootstrapFS-SVNPATH             := http://svn.planet-lab.org/svn/BootstrapFS/trunk
 MyPLC-SVNPATH                   := http://svn.planet-lab.org/svn/MyPLC/trunk
 
 # locating the right test directory - see make tests_svnpath

diff --git a/onelab.mk b/onelab.mk
index 9bf7e62..42817f6 100644 (file)
--- a/onelab.mk
+++ b/onelab.mk
@@ -436,7 +436,7 @@ NODEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(NODEREPO_RPMS))
 noderepo-MODULES := BootstrapFS 
 noderepo-SPEC := noderepo.spec
 noderepo-RPMBUILD := bash ./rpmbuild.sh
-# package requires all regular packages
+# package requires all embedded packages
 noderepo-DEPEND-PACKAGES := $(IN_BOOTSTRAPFS) $(IN_VSERVER)
 noderepo-DEPEND-FILES := RPMS/yumgroups.xml
 #export rpm list to the specfile
@@ -444,6 +444,26 @@ noderepo-SPECVARS = node_rpms_plus=$(NODEREPO_RPMS_3PLUS)
 noderepo-RPMDATE := yes
 ALL += noderepo
 
+#
+# slicerepo
+#
+# all rpms resulting from packages marked as being in vserver
+SLICEREPO_RPMS = $(foreach package,$(IN_VSERVER),$($(package).rpms))
+# replace space with +++ (specvars cannot deal with spaces)
+SPACE=$(subst x, ,x)
+SLICEREPO_RPMS_3PLUS = $(subst $(SPACE),+++,$(SLICEREPO_RPMS))
+
+slicerepo-MODULES := BootstrapFS 
+slicerepo-SPEC := slicerepo.spec
+slicerepo-RPMBUILD := bash ./rpmbuild.sh
+# package requires all embedded packages
+slicerepo-DEPEND-PACKAGES := $(IN_VSERVER)
+slicerepo-DEPEND-FILES := RPMS/yumgroups.xml
+#export rpm list to the specfile
+slicerepo-SPECVARS = slice_rpms_plus=$(SLICEREPO_RPMS_3PLUS)
+slicerepo-RPMDATE := yes
+ALL += slicerepo
+
 #
 # MyPLC : lightweight packaging, dependencies are yum-installed in a vserver
 #