From efce035cc75bbf9c98764ee1f6da76a9156b1371 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Date: Thu, 21 Jul 2011 15:23:39 +0300
Subject: Split "linaro" remote into "linaro-android" & "linaro-other".

This allows to use same project names as AOSP upstream.

Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
---
 default.xml | 45 ++++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/default.xml b/default.xml
index 58d469c56..286ae303b 100644
--- a/default.xml
+++ b/default.xml
@@ -6,10 +6,13 @@
   <default revision="refs/tags/android-2.3.4_r1"
            remote="korg" />
 
-  <remote  name="linaro"
-           fetch="git://git.linaro.org/"
+  <remote  name="linaro-android"
+           fetch="git://git.linaro.org/android/"
            review="android.git.linaro.org" />
 
+  <remote  name="linaro-other"
+           fetch="git://git.linaro.org/" />
+
   <remote  name="0xbench"
            fetch="git://gitorious.org/0xbench/" />
 
@@ -21,33 +24,33 @@
 
 
   <!-- Linaro changes -->
-  <project path="device/linaro/beagleboard" name="android/device/linaro/beagleboard" revision="linaro_android_2.3.4" remote="linaro" />
-  <project path="device/linaro/pandaboard" name="android/device/linaro/pandaboard" revision="linaro_android_2.3.4" remote="linaro" />
-  <project path="device/linaro/u8500href" name="android/device/linaro/u8500href" revision="linaro_android_2.3.4" remote="linaro" />
-  <project path="device/linaro/common" name="android/device/linaro/common" revision="linaro_android_2.3.4" remote="linaro" />
-  <project path="system/vold" name="android/platform/system/vold" revision="linaro_android_2.3.4" remote="linaro" />
-  <project path="system/core" name="android/platform/system/core" revision="linaro_android_2.3.4" remote="linaro" />
+  <project path="device/linaro/beagleboard" name="device/linaro/beagleboard" revision="linaro_android_2.3.4" remote="linaro-android" />
+  <project path="device/linaro/pandaboard" name="device/linaro/pandaboard" revision="linaro_android_2.3.4" remote="linaro-android" />
+  <project path="device/linaro/u8500href" name="device/linaro/u8500href" revision="linaro_android_2.3.4" remote="linaro-android" />
+  <project path="device/linaro/common" name="device/linaro/common" revision="linaro_android_2.3.4" remote="linaro-android" />
+  <project path="system/vold" name="platform/system/vold" revision="linaro_android_2.3.4" remote="linaro-android" />
+  <project path="system/core" name="platform/system/core" revision="linaro_android_2.3.4" remote="linaro-android" />
 
-  <project path="dalvik" name="android/platform/dalvik" revision="linaro_android_2.3.4" remote="linaro"/>
-  <project path="external/elfcopy" name="android/platform/external/elfcopy" revision="linaro_android_2.3.4" remote="linaro" />
-  <project path="external/skia" name="android/platform/external/skia" revision="linaro_android_2.3.4" remote="linaro" />
-  <project path="external/webkit" name="android/platform/external/webkit" revision="linaro_android_2.3.4" remote="linaro" />
-  <project path="frameworks/base" name="android/platform/frameworks/base" revision="linaro_android_2.3.4" remote="linaro" />
-  <project path="frameworks/opt/emoji" name="android/platform/frameworks/opt/emoji" revision="linaro_android_2.3.4" remote="linaro" />
-  <project path="libcore" name="android/platform/libcore" revision="linaro_android_2.3.4" remote="linaro" />
-  <project path="system/media" name="android/platform/system/media" revision="linaro_android_2.3.4" remote="linaro" />
-  <project path="external/svox" name="android/platform/external/svox" revision="linaro_android_2.3.4" remote="linaro" />
+  <project path="dalvik" name="platform/dalvik" revision="linaro_android_2.3.4" remote="linaro-android"/>
+  <project path="external/elfcopy" name="platform/external/elfcopy" revision="linaro_android_2.3.4" remote="linaro-android" />
+  <project path="external/skia" name="platform/external/skia" revision="linaro_android_2.3.4" remote="linaro-android" />
+  <project path="external/webkit" name="platform/external/webkit" revision="linaro_android_2.3.4" remote="linaro-android" />
+  <project path="frameworks/base" name="platform/frameworks/base" revision="linaro_android_2.3.4" remote="linaro-android" />
+  <project path="frameworks/opt/emoji" name="platform/frameworks/opt/emoji" revision="linaro_android_2.3.4" remote="linaro-android" />
+  <project path="libcore" name="platform/libcore" revision="linaro_android_2.3.4" remote="linaro-android" />
+  <project path="system/media" name="platform/system/media" revision="linaro_android_2.3.4" remote="linaro-android" />
+  <project path="external/svox" name="platform/external/svox" revision="linaro_android_2.3.4" remote="linaro-android" />
 
 
-  <project path="build" name="android/platform/build" revision="linaro_android_2.3.4" remote="linaro" >
+  <project path="build" name="platform/build" revision="linaro_android_2.3.4" remote="linaro-android" >
     <copyfile src="core/root.mk" dest="Makefile" />
   </project>
 
-  <project path="kernel" name="people/jstultz/android" revision="linaro-android-3.0" remote="linaro" />
-  <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro" />
+  <project path="kernel" name="people/jstultz/android" revision="linaro-android-3.0" remote="linaro-other" />
+  <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
 
   <project path="packages/apps/0xbench" name="0xbench" revision="master" remote="0xbench" />
-  <project path="packages/apps/mmtest" name="people/bernhardrosenkranzer/mmtest" revision="master" remote="linaro" />
+  <project path="packages/apps/mmtest" name="people/bernhardrosenkranzer/mmtest" revision="master" remote="linaro-other" />
 
   <!-- x-loader -->
   <project path="device/linaro/x-loader" name="x-loader/x-loader" revision="master" remote="gitorious" />
-- 
cgit v1.2.3