merge from svn

diff --git a/Makefile b/Makefile
index a5aacd5..fc2cf2a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -405,7 +405,7 @@ endif
 ### this utility allows to extract various info from a spec file
 ### and to define them in makefiles
 spec2make: spec2make.c
-       $(CC) -g -Wall $< -o $@ -lrpm -lrpmbuild
+       $(CC) -g -Wall $< -o $@ -lrpm -lrpmbuild -lrpmio -lpopt 
 
 ### run spec2make on the spec file and include the result
 # usage: spec2make package

diff --git a/mirroring/f13/yum.repos.d/building.repo.in b/mirroring/f13/yum.repos.d/building.repo.in
new file mode 100644 (file)
index 0000000..ab73a28
--- /dev/null
+++ b/mirroring/f13/yum.repos.d/building.repo.in
@@ -0,0 +1,20 @@
+#
+# $Id: building.repo.in 18191 2010-06-03 20:35:36Z caglar $
+# $URL: https://svn.planet-lab.org/svn/build/trunk/mirroring/f13/yum.repos.d/building.repo.in $
+#
+[fedora]
+name=Fedora 13 - $basearch
+baseurl=@MIRRORURL@/fedora/releases/13/Everything/$basearch/os/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=http://build.planet-lab.org/keys/RPM-GPG-KEY-fedora-13-primary
+
+[updates]
+name=Fedora 13 - $basearch - Updates
+baseurl=@MIRRORURL@/fedora/updates/13/$basearch/
+enabled=1
+metadata_expire=7d
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+

diff --git a/mirroring/mirror.sh b/mirroring/mirror.sh
index 7d0c26c..56c394d 100755 (executable)
--- a/mirroring/mirror.sh
+++ b/mirroring/mirror.sh
@@ -6,7 +6,7 @@ DIRNAME=$(dirname $0)
 
 default_url="http://localhost/mirror/"
 default_distro="f8"
-all_distros="f8 f10 f12 centos5"
+all_distros="f8 f10 f12 f13 centos5"
 
 function check_distro () {
     local distro=$1; shift

diff --git a/onelab-k27-tags.mk b/onelab-k27-tags.mk
index 2756244..9007ac6 100644 (file)
--- a/onelab-k27-tags.mk
+++ b/onelab-k27-tags.mk
@@ -17,7 +17,7 @@ libnl-SVNPATH                 := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.4-10
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/trunk
+NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-8
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
 CoDemux-SVNPATH                        := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-14
 fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
@@ -27,7 +27,7 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 vsys-BRANCH                    := 0.9
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
 vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-17
-PLCAPI-SVNPATH                  := http://svn.planet-lab.org/svn/PLCAPI/trunk
+PLCAPI-SVNPATH                  := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-9
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13
 PLEWWW-GITPATH                 := git://git.onelab.eu/plewww@PLEWWW-4.3-44
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3

diff --git a/onelab-tags.mk b/onelab-tags.mk
index 3374a0d..cd10264 100644 (file)
--- a/onelab-tags.mk
+++ b/onelab-tags.mk
@@ -20,7 +20,7 @@ libnl-SVNPATH                 := http://svn.planet-lab.org/svn/libnl/tags/libnl-1.1-2
 util-vserver-pl-SVNPATH                := http://svn.planet-lab.org/svn/util-vserver-pl/tags/util-vserver-pl-0.3-29
 NodeUpdate-SVNPATH             := http://svn.planet-lab.org/svn/NodeUpdate/tags/NodeUpdate-0.5-6
 PingOfDeath-SVNPATH            := http://svn.planet-lab.org/svn/PingOfDeath/tags/PingOfDeath-2.2-1
-NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/trunk
+NodeManager-SVNPATH            := http://svn.planet-lab.org/svn/NodeManager/tags/NodeManager-2.0-8
 pl_sshd-SVNPATH                        := http://svn.planet-lab.org/svn/pl_sshd/tags/pl_sshd-1.0-11
 CoDemux-SVNPATH                        := http://svn.planet-lab.org/svn/CoDemux/tags/CoDemux-0.1-14
 fprobe-ulog-SVNPATH             := http://svn.planet-lab.org/svn/fprobe-ulog/tags/fprobe-ulog-1.1.3-2
@@ -30,7 +30,7 @@ inotify-tools-SVNPATH         := http://svn.planet-lab.org/svn/inotify-tools/tags/inoti
 vsys-BRANCH                    := 0.9
 vsys-SVNPATH                   := http://svn.planet-lab.org/svn/vsys/tags/vsys-0.9-4
 vsys-scripts-SVNPATH           := http://svn.planet-lab.org/svn/vsys-scripts/tags/vsys-scripts-0.95-17
-PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/trunk
+PLCAPI-SVNPATH                 := http://svn.planet-lab.org/svn/PLCAPI/tags/PLCAPI-5.0-9
 drupal-SVNPATH                 := http://svn.planet-lab.org/svn/drupal/tags/drupal-4.7-13
 PLEWWW-GITPATH                 := git://git.onelab.eu/plewww@PLEWWW-4.3-44
 www-register-wizard-SVNPATH    := http://svn.planet-lab.org/svn/www-register-wizard/tags/www-register-wizard-4.3-3

diff --git a/vbuild-fedora-mirror.sh b/vbuild-fedora-mirror.sh
index 47c7a99..8b87363 100755 (executable)
--- a/vbuild-fedora-mirror.sh
+++ b/vbuild-fedora-mirror.sh
@@ -36,7 +36,7 @@ jp_centos_url="jp_centos_url-needs-to-be-defined"
 jp_epel_url="jp_epel_url-needs-to-be-defined"
 
 default_distroname="centos5.5"
-all_distronames="f12 centos5.4 centos5.5 epel5"
+all_distronames="f13 f12 centos5.4 centos5.5 epel5"
 default_arch="i386"
 all_archs="i386 x86_64"
 

diff --git a/vbuild-init-vserver.sh b/vbuild-init-vserver.sh
index f7092e4..24652a9 100755 (executable)
--- a/vbuild-init-vserver.sh
+++ b/vbuild-init-vserver.sh
@@ -176,7 +176,12 @@ function setup_vserver () {
 
     # Set persistent for the network context
     echo persistent,lback_allow > /etc/vservers/$vserver/nflags
- 
+
+    # Set the init style of your vserver to plain for f13
+    if [ "$fcdistro" == "f13" ] ; then
+       echo plain > /etc/vservers/$vserver/apps/init/style
+    fi
+
     if [ "$pkg_method" = "yum" ] ; then
        $personality vyum $vserver -- -y install yum
         # ditto