Split "linaro" remote into "linaro-android" & "linaro-other".

For Panda and iMX53 LEBs, following default.xml. This allows to use same project
names as AOSP upstream.

Signed-off-by: Paul Sokolovsky <pfalcon@users.sourceforge.net>

2 files changed, 49 insertions, 43 deletions

diff --git a/LEB-iMX53.xml b/LEB-iMX53.xml
index 648c4e07b..e80dc32ff 100644
--- a/LEB-iMX53.xml
+++ b/LEB-iMX53.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/" />
 
@@ -23,37 +26,37 @@
            fetch="git://gitorious.org/" />
 
   <!-- Linaro changes -->
-  <project path="device/linaro/iMX53" name="people/bernhardrosenkranzer/iMX53" revision="linaro_android_2.3.4" remote="linaro" />
-  <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="LEB-panda" 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="device/linaro/iMX53" name="people/bernhardrosenkranzer/iMX53" revision="linaro_android_2.3.4" remote="linaro-other" />
+  <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="LEB-panda" 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="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="bsp/freescale/linux-linaro-android" revision="lt-android-38" remote="linaro" / -->
+  <!--project path="kernel" name="bsp/freescale/linux-linaro-android" revision="lt-android-38" remote="linaro-other" / -->
   <!-- The kernel below is a clone of the above with a compile fix -->
-  <project path="kernel" name="people/bernhardrosenkranzer/android-kernel-iMX53" revision="linaro-android-11.07" remote="linaro" />
-  <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro" />
+  <project path="kernel" name="people/bernhardrosenkranzer/android-kernel-iMX53" revision="linaro-android-11.07" remote="linaro-other" />
+  <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro-other" />
   <!-- project path="u-boot" name="uboot-imx.git" revision="master" remote="freescale" / -->
 
   <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" />
diff --git a/LEB-panda.xml b/LEB-panda.xml
index a29692c25..8d0dcf007 100644
--- a/LEB-panda.xml
+++ b/LEB-panda.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,39 +24,39 @@
 
 
   <!-- 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="LEB-panda" 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="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="LEB-panda" 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="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/andygreen/kernel-tilt" revision="tilt-tracking-android" remote="linaro" />
-  <project path="u-boot" name="boot/u-boot-linaro-stable" revision="master" remote="linaro" />
+  <project path="kernel" name="people/andygreen/kernel-tilt" revision="tilt-tracking-android" 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" />
 
   <!-- proprietary-open - aka SGX et friends -->
-  <project path="device/ti/proprietary-open" name="android/device/ti/proprietary-open" revision="gingerbread" remote="linaro" />
+  <project path="device/ti/proprietary-open" name="device/ti/proprietary-open" revision="gingerbread" remote="linaro-android" />
 
 
   <!-- standard Andorid manifest -->