rearrange mozconfigs in preparation for crashreporter/breakpad symbols. bug 557572, r=jhford
authorAki Sasaki <asasaki@mozilla.com>
Tue, 11 May 2010 15:38:34 -0700
changeset 2403 639d7aa64e36051df3f09ea771a4ce4fe31319eb
parent 2402 17f7c2579e7ec5a80cc6bc5e3e0095ae56efe3c6
child 2404 3acc4f66e66ec0b10a83913f1b27e88aa70ae890
push id1857
push userasasaki@mozilla.com
push dateSat, 15 May 2010 00:40:58 +0000
reviewersjhford
bugs557572
rearrange mozconfigs in preparation for crashreporter/breakpad symbols. bug 557572, r=jhford
mozilla2-staging/android/mobile-browser/nightly/mozconfig
mozilla2-staging/linux/mobile-browser/nightly-gtk-e10s/mozconfig
mozilla2-staging/linux/mobile-browser/nightly-gtk/mozconfig
mozilla2-staging/linux/mobile-browser/nightly-qt-e10s/mozconfig
mozilla2-staging/linux/mobile-browser/nightly-qt/mozconfig
mozilla2-staging/linux/mobile-browser/nightly/mozconfig
mozilla2-staging/linux/mobile-browser/release/mozconfig
mozilla2-staging/linux/mobile-desktop/nightly/mozconfig
mozilla2-staging/linux64/mobile-browser/nightly/mozconfig
mozilla2-staging/linux64/mobile-desktop/nightly/mozconfig
mozilla2-staging/macosx/mobile-desktop/nightly/mozconfig
mozilla2-staging/mobile/android/mobile-browser/nightly/mozconfig
mozilla2-staging/mobile/linux-i686/mobile-1.1/nightly/mozconfig
mozilla2-staging/mobile/linux-i686/mobile-1.1/release/mozconfig
mozilla2-staging/mobile/linux-i686/mobile-browser/nightly/mozconfig
mozilla2-staging/mobile/linux-i686/mobile-browser/release/mozconfig
mozilla2-staging/mobile/macosx-i686/mobile-1.1/nightly/mozconfig
mozilla2-staging/mobile/macosx-i686/mobile-1.1/release/mozconfig
mozilla2-staging/mobile/macosx-i686/mobile-browser/nightly/mozconfig
mozilla2-staging/mobile/macosx-i686/mobile-browser/release/mozconfig
mozilla2-staging/mobile/maemo4/mobile-1.1/nightly/mozconfig
mozilla2-staging/mobile/maemo4/mobile-1.1/release/mozconfig
mozilla2-staging/mobile/maemo4/mobile-browser/nightly/mozconfig
mozilla2-staging/mobile/maemo4/mobile-browser/release/mozconfig
mozilla2-staging/mobile/maemo5-gtk/mobile-1.1/nightly/mozconfig
mozilla2-staging/mobile/maemo5-gtk/mobile-1.1/release/mozconfig
mozilla2-staging/mobile/maemo5-gtk/mobile-browser/nightly/mozconfig
mozilla2-staging/mobile/maemo5-gtk/mobile-browser/release/mozconfig
mozilla2-staging/mobile/maemo5-gtk/mobile-e10s/nightly/mozconfig
mozilla2-staging/mobile/maemo5-qt/mobile-browser/nightly/mozconfig
mozilla2-staging/mobile/maemo5-qt/mobile-e10s/nightly/mozconfig
mozilla2-staging/mobile/win32-i686/mobile-1.1/nightly/mozconfig
mozilla2-staging/mobile/win32-i686/mobile-1.1/release/mozconfig
mozilla2-staging/mobile/win32-i686/mobile-browser/nightly/mozconfig
mozilla2-staging/mobile/win32-i686/mobile-browser/release/mozconfig
mozilla2-staging/mobile_config.py
mozilla2-staging/mobile_master.py
mozilla2-staging/release-fennec-1.0.py
mozilla2-staging/release-fennec-1.1.py
mozilla2-staging/release_mobile_master.py
mozilla2-staging/win32/mobile-desktop/nightly/mozconfig
mozilla2/android/mobile-browser/nightly/mozconfig
mozilla2/linux/mobile-browser/nightly-gtk-e10s/mozconfig
mozilla2/linux/mobile-browser/nightly-gtk/mozconfig
mozilla2/linux/mobile-browser/nightly-qt-e10s/mozconfig
mozilla2/linux/mobile-browser/nightly-qt/mozconfig
mozilla2/linux/mobile-browser/nightly/mozconfig
mozilla2/linux/mobile-browser/release/mozconfig
mozilla2/linux/mobile-desktop/nightly/mozconfig
mozilla2/linux64/mobile-browser/nightly/mozconfig
mozilla2/linux64/mobile-desktop/nightly/mozconfig
mozilla2/macosx/mobile-desktop/nightly/mozconfig
mozilla2/mobile/android/mobile-browser/nightly/mozconfig
mozilla2/mobile/linux-i686/mobile-1.1/nightly/mozconfig
mozilla2/mobile/linux-i686/mobile-1.1/release/mozconfig
mozilla2/mobile/linux-i686/mobile-browser/nightly/mozconfig
mozilla2/mobile/linux-i686/mobile-browser/release/mozconfig
mozilla2/mobile/macosx-i686/mobile-1.1/nightly/mozconfig
mozilla2/mobile/macosx-i686/mobile-1.1/release/mozconfig
mozilla2/mobile/macosx-i686/mobile-browser/nightly/mozconfig
mozilla2/mobile/macosx-i686/mobile-browser/release/mozconfig
mozilla2/mobile/maemo4/mobile-1.1/nightly/mozconfig
mozilla2/mobile/maemo4/mobile-1.1/release/mozconfig
mozilla2/mobile/maemo4/mobile-browser/nightly/mozconfig
mozilla2/mobile/maemo4/mobile-browser/release/mozconfig
mozilla2/mobile/maemo5-gtk/mobile-1.1/nightly/mozconfig
mozilla2/mobile/maemo5-gtk/mobile-1.1/release/mozconfig
mozilla2/mobile/maemo5-gtk/mobile-browser/nightly/mozconfig
mozilla2/mobile/maemo5-gtk/mobile-browser/release/mozconfig
mozilla2/mobile/maemo5-gtk/mobile-e10s/nightly/mozconfig
mozilla2/mobile/maemo5-qt/mobile-browser/nightly/mozconfig
mozilla2/mobile/maemo5-qt/mobile-e10s/nightly/mozconfig
mozilla2/mobile/win32-i686/mobile-1.1/nightly/mozconfig
mozilla2/mobile/win32-i686/mobile-1.1/release/mozconfig
mozilla2/mobile/win32-i686/mobile-browser/nightly/mozconfig
mozilla2/mobile/win32-i686/mobile-browser/release/mozconfig
mozilla2/mobile_config.py
mozilla2/mobile_master.py
mozilla2/release-fennec-1.0.py
mozilla2/release-fennec-1.1.py
mozilla2/release_mobile_master.py
mozilla2/win32/mobile-desktop/nightly/mozconfig
deleted file mode 100644
--- a/mozilla2-staging/android/mobile-browser/nightly/mozconfig
+++ /dev/null
@@ -1,42 +0,0 @@
-mk_add_options JAVAC=/tools/jdk6/bin/javac
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-
-ac_add_options --enable-application=mobile
-
-ac_add_options --disable-ogg
-ac_add_options --disable-wave
-
-ac_add_options --with-arm-kuser
-
-# Global options
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-libxul
-
-# mobile options
-ac_add_options --disable-installer
-ac_add_options --disable-crashreporter
-ac_add_options --disable-printing
-ac_add_options --disable-javaxpcom
-
-# android options
-ac_add_options --target=arm-android-eabi
-
-ac_add_options --with-android-ndk=/tools/android-ndk
-ac_add_options --with-android-sdk=/tools/android-sdk/platforms/android-7
-ac_add_options --with-android-tools=/tools/android-sdk/tools
-
-ac_add_options --with-endian=little
-ac_add_options --enable-tree-freetype
-ac_add_options --enable-faststripe
-
-# other options
-ac_add_options --disable-necko-wifi
-ac_add_options --disable-plugins
-
-# to fix
-#ac_add_options --disable-crypto
-# ssltunnel can't build if we disable crypto
-
-ac_add_options --disable-tests
-
deleted file mode 100644
--- a/mozilla2-staging/linux/mobile-browser/nightly-gtk-e10s/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-#ac_add_options --with-qtdir=/opt/qt4-maemo5
-
-mk_add_options MOZ_MAKE_FLAGS=-j9
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-
-#ac_add_options --enable-debug
-#ac_add_options --disable-optimize
-
-ac_add_options --enable-application=mobile
-ac_add_options --with-arm-kuser
-ac_add_options --enable-ipc
-
-ac_add_options --with-maemo-version=5
deleted file mode 100644
--- a/mozilla2-staging/linux/mobile-browser/nightly-gtk/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-#ac_add_options --with-qtdir=/opt/qt4-maemo5
-
-mk_add_options MOZ_MAKE_FLAGS=-j9
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-
-#ac_add_options --enable-debug
-#ac_add_options --disable-optimize
-
-ac_add_options --enable-application=mobile
-ac_add_options --with-arm-kuser
-#ac_add_options --enable-ipc
-
-ac_add_options --with-maemo-version=5
deleted file mode 100644
--- a/mozilla2-staging/linux/mobile-browser/nightly-qt-e10s/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-#ac_add_options --with-qtdir=/opt/qt4-maemo5
-
-mk_add_options MOZ_MAKE_FLAGS=-j9
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-
-#ac_add_options --enable-debug
-#ac_add_options --disable-optimize
-
-ac_add_options --enable-application=mobile
-ac_add_options --with-arm-kuser
-ac_add_options --enable-ipc
-ac_add_options --enable-default-toolkit=cairo-qt
-ac_add_options --disable-crashreporter
-
-ac_add_options --with-maemo-version=5
deleted file mode 100644
--- a/mozilla2-staging/linux/mobile-browser/nightly-qt/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-#ac_add_options --with-qtdir=/opt/qt4-maemo5
-
-mk_add_options MOZ_MAKE_FLAGS=-j9
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-
-#ac_add_options --enable-debug
-#ac_add_options --disable-optimize
-
-ac_add_options --enable-application=mobile
-ac_add_options --with-arm-kuser
-#ac_add_options --enable-ipc
-ac_add_options --enable-default-toolkit=cairo-qt
-ac_add_options --disable-crashreporter
-
-ac_add_options --with-maemo-version=5
deleted file mode 100644
--- a/mozilla2-staging/linux/mobile-browser/nightly/mozconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-
-export LDFLAGS='-Wl,-rpath-link,/usr/lib:/lib'
-
-ac_add_options --with-maemo-version=5
-
-# install locations for Maemo
-ac_add_options --prefix=/opt/mozilla
-ac_add_options --libdir=/opt/mozilla
-
-ac_add_options --disable-javaxpcom
-ac_add_options --with-arm-kuser
-# updater isn't used for Maemo
-ac_add_options --disable-updater
-ac_add_options --enable-application=mobile
-ac_add_options --disable-ipc
deleted file mode 100644
--- a/mozilla2-staging/linux/mobile-browser/release/mozconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-
-export LDFLAGS='-Wl,-rpath-link,/usr/lib:/lib'
-
-ac_add_options --with-maemo-version=5
-
-# install locations for Maemo
-ac_add_options --prefix=/opt/mozilla
-ac_add_options --libdir=/opt/mozilla
-
-ac_add_options --disable-javaxpcom
-ac_add_options --with-arm-kuser
-# updater isn't used for Maemo
-ac_add_options --disable-updater
-ac_add_options --disable-ipc
-ac_add_options --enable-application=mobile
-ac_add_options --enable-official-branding
deleted file mode 100644
--- a/mozilla2-staging/linux/mobile-desktop/nightly/mozconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-mk_add_options MOZ_PKG_FORMAT=BZ2
-ac_add_options --disable-javaxpcom
-ac_add_options --enable-application=mobile
-
-CC=/tools/gcc-4.3.3/installed/bin/gcc
-CXX=/tools/gcc-4.3.3/installed/bin/g++
deleted file mode 100644
--- a/mozilla2-staging/linux64/mobile-browser/nightly/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile"
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-
-export LDFLAGS='-Wl,-rpath-link,/usr/lib:/lib'
-
-ac_add_options --disable-javaxpcom
-
-ac_add_app_options xulrunner --with-arm-kuser
-ac_add_app_options xulrunner --enable-application=xulrunner
-
-ac_add_app_options mobile --enable-application=mobile
-ac_add_app_options mobile --with-libxul-sdk=../xulrunner/dist
-
-ac_add_options --enable-tests
deleted file mode 100644
--- a/mozilla2-staging/linux64/mobile-desktop/nightly/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile"
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-mk_add_options MOZ_PKG_FORMAT=BZ2
-ac_add_options --disable-javaxpcom
-ac_add_app_options xulrunner --enable-application=xulrunner
-ac_add_app_options mobile --enable-application=mobile
-ac_add_app_options mobile --with-libxul-sdk=../xulrunner/dist
-
-CC=/tools/gcc-4.3.3/installed/bin/gcc
-CXX=/tools/gcc-4.3.3/installed/bin/g++
deleted file mode 100644
--- a/mozilla2-staging/macosx/mobile-desktop/nightly/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-mk_add_options AUTOCONF=autoconf213
-
-# Global options
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-ac_cv_visibility_pragma=no
-
-# Debug Build Setup Options
-ac_add_options --enable-optimize
-ac_add_options --disable-debug
-ac_add_options --disable-install-strip
-
-ac_add_options --disable-installer
-ac_add_options --enable-application=mobile
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/android/mobile-browser/nightly/mozconfig
@@ -0,0 +1,42 @@
+mk_add_options JAVAC=/tools/jdk6/bin/javac
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+ac_add_options --enable-application=mobile
+
+ac_add_options --disable-ogg
+ac_add_options --disable-wave
+
+ac_add_options --with-arm-kuser
+
+# Global options
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+ac_add_options --enable-libxul
+
+# mobile options
+ac_add_options --disable-installer
+ac_add_options --disable-crashreporter
+ac_add_options --disable-printing
+ac_add_options --disable-javaxpcom
+
+# android options
+ac_add_options --target=arm-android-eabi
+
+ac_add_options --with-android-ndk=/tools/android-ndk
+ac_add_options --with-android-sdk=/tools/android-sdk/platforms/android-7
+ac_add_options --with-android-tools=/tools/android-sdk/tools
+
+ac_add_options --with-endian=little
+ac_add_options --enable-tree-freetype
+ac_add_options --enable-faststripe
+
+# other options
+ac_add_options --disable-necko-wifi
+ac_add_options --disable-plugins
+
+# to fix
+#ac_add_options --disable-crypto
+# ssltunnel can't build if we disable crypto
+
+ac_add_options --disable-tests
+
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/linux-i686/mobile-1.1/nightly/mozconfig
@@ -0,0 +1,7 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_PKG_FORMAT=BZ2
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=mobile
+
+CC=/tools/gcc-4.3.3/installed/bin/gcc
+CXX=/tools/gcc-4.3.3/installed/bin/g++
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/linux-i686/mobile-1.1/release/mozconfig
@@ -0,0 +1,7 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_PKG_FORMAT=BZ2
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=mobile
+
+CC=/tools/gcc-4.3.3/installed/bin/gcc
+CXX=/tools/gcc-4.3.3/installed/bin/g++
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/linux-i686/mobile-browser/nightly/mozconfig
@@ -0,0 +1,7 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_PKG_FORMAT=BZ2
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=mobile
+
+CC=/tools/gcc-4.3.3/installed/bin/gcc
+CXX=/tools/gcc-4.3.3/installed/bin/g++
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/linux-i686/mobile-browser/release/mozconfig
@@ -0,0 +1,7 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_PKG_FORMAT=BZ2
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=mobile
+
+CC=/tools/gcc-4.3.3/installed/bin/gcc
+CXX=/tools/gcc-4.3.3/installed/bin/g++
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/macosx-i686/mobile-1.1/nightly/mozconfig
@@ -0,0 +1,15 @@
+# Options for client.mk.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options AUTOCONF=autoconf213
+
+# Global options
+ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
+ac_cv_visibility_pragma=no
+
+# Debug Build Setup Options
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --disable-install-strip
+
+ac_add_options --disable-installer
+ac_add_options --enable-application=mobile
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/macosx-i686/mobile-1.1/release/mozconfig
@@ -0,0 +1,15 @@
+# Options for client.mk.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options AUTOCONF=autoconf213
+
+# Global options
+ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
+ac_cv_visibility_pragma=no
+
+# Debug Build Setup Options
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --disable-install-strip
+
+ac_add_options --disable-installer
+ac_add_options --enable-application=mobile
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/macosx-i686/mobile-browser/nightly/mozconfig
@@ -0,0 +1,15 @@
+# Options for client.mk.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options AUTOCONF=autoconf213
+
+# Global options
+ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
+ac_cv_visibility_pragma=no
+
+# Debug Build Setup Options
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --disable-install-strip
+
+ac_add_options --disable-installer
+ac_add_options --enable-application=mobile
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/macosx-i686/mobile-browser/release/mozconfig
@@ -0,0 +1,15 @@
+# Options for client.mk.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options AUTOCONF=autoconf213
+
+# Global options
+ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
+ac_cv_visibility_pragma=no
+
+# Debug Build Setup Options
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --disable-install-strip
+
+ac_add_options --disable-installer
+ac_add_options --enable-application=mobile
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/maemo4/mobile-1.1/nightly/mozconfig
@@ -0,0 +1,16 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+export LDFLAGS='-Wl,-rpath-link,/usr/lib:/lib'
+
+ac_add_options --with-maemo-version=5
+
+# install locations for Maemo
+ac_add_options --prefix=/opt/mozilla
+ac_add_options --libdir=/opt/mozilla
+
+ac_add_options --disable-javaxpcom
+ac_add_options --with-arm-kuser
+# updater isn't used for Maemo
+ac_add_options --disable-updater
+ac_add_options --enable-application=mobile
+ac_add_options --disable-ipc
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/maemo4/mobile-1.1/release/mozconfig
@@ -0,0 +1,17 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+export LDFLAGS='-Wl,-rpath-link,/usr/lib:/lib'
+
+ac_add_options --with-maemo-version=5
+
+# install locations for Maemo
+ac_add_options --prefix=/opt/mozilla
+ac_add_options --libdir=/opt/mozilla
+
+ac_add_options --disable-javaxpcom
+ac_add_options --with-arm-kuser
+# updater isn't used for Maemo
+ac_add_options --disable-updater
+ac_add_options --disable-ipc
+ac_add_options --enable-application=mobile
+ac_add_options --enable-official-branding
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/maemo4/mobile-browser/nightly/mozconfig
@@ -0,0 +1,16 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+export LDFLAGS='-Wl,-rpath-link,/usr/lib:/lib'
+
+ac_add_options --with-maemo-version=5
+
+# install locations for Maemo
+ac_add_options --prefix=/opt/mozilla
+ac_add_options --libdir=/opt/mozilla
+
+ac_add_options --disable-javaxpcom
+ac_add_options --with-arm-kuser
+# updater isn't used for Maemo
+ac_add_options --disable-updater
+ac_add_options --enable-application=mobile
+ac_add_options --disable-ipc
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/maemo4/mobile-browser/release/mozconfig
@@ -0,0 +1,17 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+export LDFLAGS='-Wl,-rpath-link,/usr/lib:/lib'
+
+ac_add_options --with-maemo-version=5
+
+# install locations for Maemo
+ac_add_options --prefix=/opt/mozilla
+ac_add_options --libdir=/opt/mozilla
+
+ac_add_options --disable-javaxpcom
+ac_add_options --with-arm-kuser
+# updater isn't used for Maemo
+ac_add_options --disable-updater
+ac_add_options --disable-ipc
+ac_add_options --enable-application=mobile
+ac_add_options --enable-official-branding
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/maemo5-gtk/mobile-1.1/nightly/mozconfig
@@ -0,0 +1,13 @@
+#ac_add_options --with-qtdir=/opt/qt4-maemo5
+
+mk_add_options MOZ_MAKE_FLAGS=-j9
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+
+ac_add_options --enable-application=mobile
+ac_add_options --with-arm-kuser
+#ac_add_options --enable-ipc
+
+ac_add_options --with-maemo-version=5
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/maemo5-gtk/mobile-1.1/release/mozconfig
@@ -0,0 +1,13 @@
+#ac_add_options --with-qtdir=/opt/qt4-maemo5
+
+mk_add_options MOZ_MAKE_FLAGS=-j9
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+
+ac_add_options --enable-application=mobile
+ac_add_options --with-arm-kuser
+#ac_add_options --enable-ipc
+
+ac_add_options --with-maemo-version=5
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/maemo5-gtk/mobile-browser/nightly/mozconfig
@@ -0,0 +1,13 @@
+#ac_add_options --with-qtdir=/opt/qt4-maemo5
+
+mk_add_options MOZ_MAKE_FLAGS=-j9
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+
+ac_add_options --enable-application=mobile
+ac_add_options --with-arm-kuser
+#ac_add_options --enable-ipc
+
+ac_add_options --with-maemo-version=5
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/maemo5-gtk/mobile-browser/release/mozconfig
@@ -0,0 +1,13 @@
+#ac_add_options --with-qtdir=/opt/qt4-maemo5
+
+mk_add_options MOZ_MAKE_FLAGS=-j9
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+
+ac_add_options --enable-application=mobile
+ac_add_options --with-arm-kuser
+#ac_add_options --enable-ipc
+
+ac_add_options --with-maemo-version=5
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/maemo5-gtk/mobile-e10s/nightly/mozconfig
@@ -0,0 +1,13 @@
+#ac_add_options --with-qtdir=/opt/qt4-maemo5
+
+mk_add_options MOZ_MAKE_FLAGS=-j9
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+
+ac_add_options --enable-application=mobile
+ac_add_options --with-arm-kuser
+ac_add_options --enable-ipc
+
+ac_add_options --with-maemo-version=5
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/maemo5-qt/mobile-browser/nightly/mozconfig
@@ -0,0 +1,15 @@
+#ac_add_options --with-qtdir=/opt/qt4-maemo5
+
+mk_add_options MOZ_MAKE_FLAGS=-j9
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+
+ac_add_options --enable-application=mobile
+ac_add_options --with-arm-kuser
+#ac_add_options --enable-ipc
+ac_add_options --enable-default-toolkit=cairo-qt
+ac_add_options --disable-crashreporter
+
+ac_add_options --with-maemo-version=5
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/maemo5-qt/mobile-e10s/nightly/mozconfig
@@ -0,0 +1,15 @@
+#ac_add_options --with-qtdir=/opt/qt4-maemo5
+
+mk_add_options MOZ_MAKE_FLAGS=-j9
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+
+ac_add_options --enable-application=mobile
+ac_add_options --with-arm-kuser
+ac_add_options --enable-ipc
+ac_add_options --enable-default-toolkit=cairo-qt
+ac_add_options --disable-crashreporter
+
+ac_add_options --with-maemo-version=5
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/win32-i686/mobile-1.1/nightly/mozconfig
@@ -0,0 +1,14 @@
+# Options for client.mk.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_PKG_FORMAT=ZIP
+
+export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
+
+# Global options
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+ac_add_options --enable-tests
+ac_add_options --enable-jemalloc
+
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=mobile
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/win32-i686/mobile-1.1/release/mozconfig
@@ -0,0 +1,14 @@
+# Options for client.mk.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_PKG_FORMAT=ZIP
+
+export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
+
+# Global options
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+ac_add_options --enable-tests
+ac_add_options --enable-jemalloc
+
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=mobile
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/win32-i686/mobile-browser/nightly/mozconfig
@@ -0,0 +1,14 @@
+# Options for client.mk.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_PKG_FORMAT=ZIP
+
+export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
+
+# Global options
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+ac_add_options --enable-tests
+ac_add_options --enable-jemalloc
+
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=mobile
new file mode 100644
--- /dev/null
+++ b/mozilla2-staging/mobile/win32-i686/mobile-browser/release/mozconfig
@@ -0,0 +1,14 @@
+# Options for client.mk.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_PKG_FORMAT=ZIP
+
+export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
+
+# Global options
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+ac_add_options --enable-tests
+ac_add_options --enable-jemalloc
+
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=mobile
--- a/mozilla2-staging/mobile_config.py
+++ b/mozilla2-staging/mobile_config.py
@@ -1,25 +1,26 @@
 # -*- python -*-
 # ex: set syntax=python:
 
 from copy import deepcopy
+import re
 
 import config
 reload(config)
 
 import buildbotcustom.env
 reload(buildbotcustom.env)
 from buildbotcustom.env import MozillaEnvironments
 
 OBJDIR = 'objdir'
 SBOX_HOME = '/scratchbox/users/cltbld/home/cltbld'
 
 MOBILE_SLAVES = {
-    'linux-gnueabi-arm': config.SLAVES['linux'],
+    'maemo4': config.SLAVES['linux'],
     'maemo5-gtk': config.SLAVES['linux'],
     'maemo5-qt': config.SLAVES['linux'],
     'linux-i686': config.SLAVES['linux'],
     'macosx-i686': config.SLAVES['macosx'],
     'win32-i686': config.SLAVES['win32'],
     'android-r7': config.SLAVES['linux'],
 }
 
@@ -37,83 +38,83 @@ MOBILE_BRANCHES['mobile-trunk']['repo_pa
 MOBILE_BRANCHES['mobile-trunk']['l10n_repo_path'] = 'l10n-central'
 MOBILE_BRANCHES['mobile-trunk']['mobile_repo_path'] = 'mobile-browser'
 MOBILE_BRANCHES['mobile-trunk']['product_name'] = 'fennec'
 MOBILE_BRANCHES['mobile-trunk']['app_name'] = 'mobile'
 MOBILE_BRANCHES['mobile-trunk']['aus2_base_upload_dir'] = '/opt/aus2/build/0/{a23983c0-fd0e-11dc-95ff-0800200c9a66}/mozilla-central'
 MOBILE_BRANCHES['mobile-trunk']['download_base_url'] = 'http://staging-stage.build.mozilla.org/pub/mozilla.org/mobile'
 MOBILE_BRANCHES['mobile-trunk']['stage_base_path'] = '/home/ftp/pub/mobile'
 MOBILE_BRANCHES['mobile-trunk']['platforms'] = {
-    'linux-gnueabi-arm': {},
+    'maemo4': {},
     'linux-i686': {},
     'macosx-i686': {},
     'win32-i686': {},
     'android-r7': {},
 }
 MOBILE_BRANCHES['mobile-trunk']['l10n_platforms'] = {}
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['sb_target'] = 'CHINOOK-ARMEL-2007'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['mozconfig'] = 'linux/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['mozconfig'] = 'macosx/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['mozconfig'] = 'win32/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['android-r7']['mozconfig'] = 'android/mobile-browser/nightly'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo mozilla-central'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['mozconfig'] = 'mobile/maemo4/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['sb_target'] = 'CHINOOK-ARMEL-2007'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['mozconfig'] = 'mobile/linux-i686/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['mozconfig'] = 'mobile/macosx-i686/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['mozconfig'] = 'mobile/win32-i686/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['android-r7']['mozconfig'] = 'mobile/android/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['base_name'] = 'Maemo mozilla-central'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_name'] = 'Linux Fennec Desktop mozilla-central'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['base_name'] = 'OS X Fennec Desktop mozilla-central'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['base_name'] = 'Win32 Fennec Desktop mozilla-central'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['android-r7']['base_name'] = 'Android mozilla-central'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['build_space'] = 5
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['build_space'] = 5
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['build_space'] = 5
 MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['build_space'] = 5
 MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['build_space'] = 5
 MOBILE_BRANCHES['mobile-trunk']['platforms']['android-r7']['build_space'] = 5
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['builds_before_reboot'] = 5
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['builds_before_reboot'] = 5
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['builds_before_reboot'] = 5
 MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['builds_before_reboot'] = 5
 MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['builds_before_reboot'] = 5
 MOBILE_BRANCHES['mobile-trunk']['platforms']['android-r7']['builds_before_reboot'] = 5
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build/maemo-trunk' % SBOX_HOME
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-trunk'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['base_workdir'] = '%s/build/maemo-trunk' % SBOX_HOME
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['base_builddir'] = 'maemo-trunk'
 # This base directory is for the individual locales repackaging; it is not for the multi-locale build
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_l10n_workdir'] = '%s/build/maemo-trunk-l10n' % SBOX_HOME
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['base_l10n_workdir'] = '%s/build/maemo-trunk-l10n' % SBOX_HOME
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_builddir'] = 'linux-fennec-trunk'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_l10n_workdir'] = 'build/linux-fennec-trunk-l10n'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['base_builddir'] = 'macosx-fennec-trunk'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['base_l10n_workdir'] = 'build/macosx-fennec-trunk-l10n'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['base_workdir'] = '.'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['base_builddir'] = 'w32mob-trunk'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['base_l10n_workdir'] = 'w32mob-trunk-l10n'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['android-r7']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['android-r7']['base_builddir'] = 'android-trunk'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['android-r7']['base_l10n_workdir'] = 'android-trunk-l10n'
 MOBILE_BRANCHES['mobile-trunk']['enable_l10n'] = True
 MOBILE_BRANCHES['mobile-trunk']['enable_l10n_onchange'] = True
 MOBILE_BRANCHES['mobile-trunk']['enable_multi_locale'] = True
 MOBILE_BRANCHES['mobile-trunk']['l10n_tree'] = 'fennec_mc'
-MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['linux-gnueabi-arm'] = 'linux'
+MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['maemo4'] = 'linux'
 MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['linux-i686'] = 'linux'
 #MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['macosx-i686'] = 'macosx'
 MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['win32-i686'] = 'win32'
 #MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['android-r7'] = 'linux'
 MOBILE_BRANCHES['mobile-trunk']['allLocalesFile'] = "locales/all-locales"
 MOBILE_BRANCHES['mobile-trunk']['multiLocalesFile'] = "locales/maemo-locales"
 MOBILE_BRANCHES['mobile-trunk']['l10nUploadPath'] = \
     '/home/ftp/pub/mozilla.org/mobile/nightly/latest-mobile-trunk-l10n'
 MOBILE_BRANCHES['mobile-trunk']['enUS_binaryURL'] = \
     MOBILE_BRANCHES['mobile-trunk']['download_base_url'] + '/nightly/latest-mobile-trunk'
 MOBILE_BRANCHES['mobile-trunk']['tinderbox_tree'] = 'MozillaTest'
 MOBILE_BRANCHES['mobile-trunk']['l10n_tinderbox_tree'] = 'MozillaStaging'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['slaves'] = MOBILE_SLAVES['linux-gnueabi-arm']
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['slaves'] = MOBILE_SLAVES['maemo4']
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['slaves'] = MOBILE_SLAVES['linux-i686']
 MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['slaves'] = MOBILE_SLAVES['macosx-i686']
 MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['slaves'] = MOBILE_SLAVES['win32-i686']
 MOBILE_BRANCHES['mobile-trunk']['platforms']['android-r7']['slaves'] = MOBILE_SLAVES['android-r7']
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['env'] = {}
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['env'] = {}
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['env'] = {}
 MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['env'] = {
     'CHOWN_ROOT': '~/bin/chown_root',
     'CHOWN_REVERT': '~/bin/chown_revert',
 }
 MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['env'] = {}
 MOBILE_BRANCHES['mobile-trunk']['platforms']['android-r7']['env'] = {}
 
@@ -123,73 +124,73 @@ MOBILE_BRANCHES['mobile-1.9.2']['repo_pa
 MOBILE_BRANCHES['mobile-1.9.2']['l10n_repo_path'] = 'releases/l10n-mozilla-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['mobile_repo_path'] = 'releases/mobile-1.1'
 MOBILE_BRANCHES['mobile-1.9.2']['product_name'] = 'fennec'
 MOBILE_BRANCHES['mobile-1.9.2']['app_name'] = 'mobile'
 MOBILE_BRANCHES['mobile-1.9.2']['aus2_base_upload_dir'] = '/opt/aus2/build/0/{a23983c0-fd0e-11dc-95ff-0800200c9a66}/mozilla-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['download_base_url'] = 'http://staging-stage.build.mozilla.org/pub/mozilla.org/mobile'
 MOBILE_BRANCHES['mobile-1.9.2']['stage_base_path'] = '/home/ftp/pub/mobile'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms'] = {
-    'linux-gnueabi-arm': {},
+    'maemo4': {},
     'linux-i686': {},
     'macosx-i686': {},
     'win32-i686': {},
 }
 MOBILE_BRANCHES['mobile-1.9.2']['l10n_platforms'] = {}
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['sb_target'] = 'CHINOOK-ARMEL-2007'
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['mozconfig'] = 'linux/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['mozconfig'] = 'macosx/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['mozconfig'] = 'win32/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo mozilla-1.9.2'
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['mozconfig'] = 'mobile/maemo4/mobile-1.1/nightly'
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['sb_target'] = 'CHINOOK-ARMEL-2007'
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['mozconfig'] = 'mobile/linux-i686/mobile-1.1/nightly'
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['mozconfig'] = 'mobile/macosx-i686/mobile-1.1/nightly'
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['mozconfig'] = 'mobile/win32-i686/mobile-1.1/nightly'
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['base_name'] = 'Maemo mozilla-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['base_name'] = 'Linux Fennec Desktop mozilla-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['base_name'] = 'OS X Fennec Desktop mozilla-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['base_name'] = 'Win32 Fennec Desktop mozilla-1.9.2'
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['build_space'] = 5
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['build_space'] = 5
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['build_space'] = 5
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['build_space'] = 5
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['build_space'] = 5
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['builds_before_reboot'] = 5
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['builds_before_reboot'] = 5
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['builds_before_reboot'] = 5
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['builds_before_reboot'] = 5
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['builds_before_reboot'] = 5
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build/maemo-1.9.2' % SBOX_HOME
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-1.9.2'
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['base_workdir'] = '%s/build/maemo-1.9.2' % SBOX_HOME
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['base_builddir'] = 'maemo-1.9.2'
 # This base directory is for the individual locales repackaging; it is not for the multi-locale build
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['base_l10n_workdir'] = '%s/build/maemo-1.9.2-l10n' % SBOX_HOME
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['base_l10n_workdir'] = '%s/build/maemo-1.9.2-l10n' % SBOX_HOME
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['base_builddir'] = 'linux-fennec-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['base_l10n_workdir'] = 'build/linux-fennec-1.9.2-l10n'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['base_builddir'] = 'macosx-fennec-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['base_l10n_workdir'] = 'build/macosx-fennec-1.9.2-l10n'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['base_workdir'] = '.'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['base_builddir'] = 'w32mob-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['base_l10n_workdir'] = 'w32mob-1.9.2-l10n'
 MOBILE_BRANCHES['mobile-1.9.2']['enable_l10n'] = True
 MOBILE_BRANCHES['mobile-1.9.2']['enable_l10n_onchange'] = True
 MOBILE_BRANCHES['mobile-1.9.2']['enable_multi_locale'] = True
 MOBILE_BRANCHES['mobile-1.9.2']['l10n_tree'] = 'fennec11x'
-MOBILE_BRANCHES['mobile-1.9.2']['l10n_platforms']['linux-gnueabi-arm'] = 'linux'
+MOBILE_BRANCHES['mobile-1.9.2']['l10n_platforms']['maemo4'] = 'linux'
 MOBILE_BRANCHES['mobile-1.9.2']['l10n_platforms']['linux-i686'] = 'linux'
 #MOBILE_BRANCHES['mobile-1.9.2']['l10n_platforms']['macosx-i686'] = 'macosx'
 MOBILE_BRANCHES['mobile-1.9.2']['l10n_platforms']['win32-i686'] = 'win32'
 MOBILE_BRANCHES['mobile-1.9.2']['allLocalesFile'] = "locales/all-locales"
 MOBILE_BRANCHES['mobile-1.9.2']['multiLocalesFile'] = "locales/maemo-locales"
 MOBILE_BRANCHES['mobile-1.9.2']['l10nUploadPath'] = \
     '/home/ftp/pub/mozilla.org/mobile/nightly/latest-mobile-1.9.2-l10n'
 MOBILE_BRANCHES['mobile-1.9.2']['tinderbox_tree'] = 'MozillaTest'
 MOBILE_BRANCHES['mobile-1.9.2']['l10n_tinderbox_tree'] = 'MozillaStaging'
 MOBILE_BRANCHES['mobile-1.9.2']['enUS_binaryURL'] = \
     MOBILE_BRANCHES['mobile-1.9.2']['download_base_url'] + '/nightly/latest-mobile-1.9.2'
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['slaves'] = MOBILE_SLAVES['linux-gnueabi-arm']
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['slaves'] = MOBILE_SLAVES['maemo4']
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['slaves'] = MOBILE_SLAVES['linux-i686']
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['slaves'] = MOBILE_SLAVES['macosx-i686']
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['slaves'] = MOBILE_SLAVES['win32-i686']
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['env'] = {}
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['env'] = {}
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['env'] = {}
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['env'] = {
     'CHOWN_ROOT': '~/bin/chown_root',
     'CHOWN_REVERT': '~/bin/chown_revert',
 }
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['env'] = {}
 
 ### mobile-tracemonkey
@@ -198,131 +199,131 @@ MOBILE_BRANCHES['mobile-tracemonkey']['r
 MOBILE_BRANCHES['mobile-tracemonkey']['l10n_repo_path'] = 'l10n-central'
 MOBILE_BRANCHES['mobile-tracemonkey']['mobile_repo_path'] = 'mobile-browser'
 MOBILE_BRANCHES['mobile-tracemonkey']['product_name'] = 'fennec'
 MOBILE_BRANCHES['mobile-tracemonkey']['app_name'] = 'mobile'
 MOBILE_BRANCHES['mobile-tracemonkey']['aus2_base_upload_dir'] = None
 MOBILE_BRANCHES['mobile-tracemonkey']['download_base_url'] = 'http://staging-stage.build.mozilla.org/pub/mozilla.org/mobile'
 MOBILE_BRANCHES['mobile-tracemonkey']['stage_base_path'] = '/home/ftp/pub/mobile'
 MOBILE_BRANCHES['mobile-tracemonkey']['platforms'] = {
-    'linux-gnueabi-arm': {},
+    'maemo4': {},
 }
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['sb_target'] = 'CHINOOK-ARMEL-2007'
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo Tracemonkey'
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['build_space'] = 5
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['builds_before_reboot'] = 5
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build/maemo-tracemonkey' % SBOX_HOME
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-tracemonkey'
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['mozconfig'] = 'mobile/maemo4/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['sb_target'] = 'CHINOOK-ARMEL-2007'
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['base_name'] = 'Maemo Tracemonkey'
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['build_space'] = 5
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['builds_before_reboot'] = 5
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['base_workdir'] = '%s/build/maemo-tracemonkey' % SBOX_HOME
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['base_builddir'] = 'maemo-tracemonkey'
 MOBILE_BRANCHES['mobile-tracemonkey']['enable_l10n'] = False
 MOBILE_BRANCHES['mobile-tracemonkey']['enable_l10n_onchange'] = False
 MOBILE_BRANCHES['mobile-tracemonkey']['enable_multi_locale'] = False
 MOBILE_BRANCHES['mobile-tracemonkey']['tinderbox_tree'] = 'MozillaTest'
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['slaves'] = MOBILE_SLAVES['linux-gnueabi-arm']
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['env'] = {}
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['slaves'] = MOBILE_SLAVES['maemo4']
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['env'] = {}
 
 ### electrolysis
 MOBILE_BRANCHES['mobile-electrolysis']['main_config'] = config.BRANCHES['electrolysis']
 MOBILE_BRANCHES['mobile-electrolysis']['repo_path'] = 'projects/electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['l10n_repo_path'] = 'l10n-central'
 MOBILE_BRANCHES['mobile-electrolysis']['mobile_repo_path'] = 'mobile-browser'
 MOBILE_BRANCHES['mobile-electrolysis']['product_name'] = 'fennec'
 MOBILE_BRANCHES['mobile-electrolysis']['app_name'] = 'mobile'
 MOBILE_BRANCHES['mobile-electrolysis']['aus2_base_upload_dir'] = None
 MOBILE_BRANCHES['mobile-electrolysis']['download_base_url'] = 'http://staging-stage.build.mozilla.org/pub/mozilla.org/mobile'
 MOBILE_BRANCHES['mobile-electrolysis']['stage_base_path'] = '/home/ftp/pub/mobile'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms'] = {
-    'linux-gnueabi-arm': {},
+    'maemo4': {},
     'linux-i686': {},
 }
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['sb_target'] = 'CHINOOK-ARMEL-2007'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['mozconfig'] = 'linux/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo electrolysis'
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['mozconfig'] = 'mobile/maemo4/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['sb_target'] = 'CHINOOK-ARMEL-2007'
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['mozconfig'] = 'mobile/linux-i686/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['base_name'] = 'Maemo electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_name'] = 'Linux Fennec Desktop electrolysis'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['build_space'] = 5
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['build_space'] = 5
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['build_space'] = 5
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['builds_before_reboot'] = 5
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['builds_before_reboot'] = 5
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['builds_before_reboot'] = 5
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build/maemo-electrolysis' % SBOX_HOME
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-electrolysis'
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['base_workdir'] = '%s/build/maemo-electrolysis' % SBOX_HOME
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['base_builddir'] = 'maemo-electrolysis'
 # This base directory is for the individual locales repackaging; it is not for the multi-locale build
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['base_l10n_workdir'] = '%s/build/maemo-electrolysis-l10n' % SBOX_HOME
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['base_l10n_workdir'] = '%s/build/maemo-electrolysis-l10n' % SBOX_HOME
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_builddir'] = 'linux-fennec-electrolysis'
 # This base directory is for the individual locales repackaging; it is not for the multi-locale build
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_l10n_workdir'] = 'build/linux-fennec-electrolysis-l10n'
 MOBILE_BRANCHES['mobile-electrolysis']['enable_l10n'] = False
 MOBILE_BRANCHES['mobile-electrolysis']['enable_l10n_onchange'] = False
 MOBILE_BRANCHES['mobile-electrolysis']['enable_multi_locale'] = False
 MOBILE_BRANCHES['mobile-electrolysis']['enUS_binaryURL'] = \
     MOBILE_BRANCHES['mobile-electrolysis']['download_base_url'] + '/nightly/latest-mobile-electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['tinderbox_tree'] = 'MozillaTest'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['slaves'] = MOBILE_SLAVES['linux-gnueabi-arm']
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['slaves'] = MOBILE_SLAVES['maemo4']
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['slaves'] = MOBILE_SLAVES['linux-i686']
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['env'] = {}
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['env'] = {}
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['env'] = {}
 
 ### mozilla-addonsmgr
 MOBILE_BRANCHES['mobile-addonsmgr']['main_config'] = config.BRANCHES['addonsmgr']
 MOBILE_BRANCHES['mobile-addonsmgr']['repo_path'] = 'projects/addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['l10n_repo_path'] = 'l10n-central'
 MOBILE_BRANCHES['mobile-addonsmgr']['mobile_repo_path'] = 'mobile-browser'
 MOBILE_BRANCHES['mobile-addonsmgr']['product_name'] = 'fennec'
 MOBILE_BRANCHES['mobile-addonsmgr']['app_name'] = 'mobile'
 MOBILE_BRANCHES['mobile-addonsmgr']['aus2_base_upload_dir'] = '/opt/aus2/build/0/{a23983c0-fd0e-11dc-95ff-0800200c9a66}/addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['download_base_url'] = 'http://staging-stage.build.mozilla.org/pub/mozilla.org/mobile'
 MOBILE_BRANCHES['mobile-addonsmgr']['stage_base_path'] = '/home/ftp/pub/mobile'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms'] = {
-    'linux-gnueabi-arm': {},
+    'maemo4': {},
     'linux-i686': {},
     'macosx-i686': {},
     'win32-i686': {},
 }
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['sb_target'] = 'CHINOOK-ARMEL-2007'
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['mozconfig'] = 'linux/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['mozconfig'] = 'macosx/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['mozconfig'] = 'win32/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo Addonsmgr'
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['mozconfig'] = 'mobile/maemo4/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['sb_target'] = 'CHINOOK-ARMEL-2007'
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['mozconfig'] = 'mobile/linux-i686/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['mozconfig'] = 'mobile/macosx-i686/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['mozconfig'] = 'mobile/win32-i686/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['base_name'] = 'Maemo Addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['base_name'] = 'Linux Fennec Desktop Addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['base_name'] = 'OS X Fennec Desktop Addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['base_name'] = 'Win32 Fennec Desktop Addonsmgr'
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['build_space'] = 5
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['build_space'] = 5
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['build_space'] = 5
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['build_space'] = 5
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['build_space'] = 5
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['builds_before_reboot'] = 5
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['builds_before_reboot'] = 5
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['builds_before_reboot'] = 5
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['builds_before_reboot'] = 5
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['builds_before_reboot'] = 5
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build/maemo-addonsmgr' % SBOX_HOME
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-addonsmgr'
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['base_workdir'] = '%s/build/maemo-addonsmgr' % SBOX_HOME
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['base_builddir'] = 'maemo-addonsmgr'
 # This base directory is for the individual locales repackaging; it is not for the multi-locale build
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['base_l10n_workdir'] = '%s/build/maemo-addonsmgr-l10n' % SBOX_HOME
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['base_l10n_workdir'] = '%s/build/maemo-addonsmgr-l10n' % SBOX_HOME
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['base_builddir'] = 'linux-fennec-addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['base_l10n_workdir'] = 'build/linux-fennec-addonsmgr-l10n'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['base_builddir'] = 'macosx-fennec-addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['base_l10n_workdir'] = 'build/macosx-fennec-addonsmgr-l10n'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['base_workdir'] = '.'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['base_builddir'] = 'w32mob-addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['base_l10n_workdir'] = 'w32mob-addonsmgr-l10n'
 MOBILE_BRANCHES['mobile-addonsmgr']['enable_l10n'] = False
 MOBILE_BRANCHES['mobile-addonsmgr']['enable_l10n_onchange'] = False
 MOBILE_BRANCHES['mobile-addonsmgr']['enable_multi_locale'] = False
 MOBILE_BRANCHES['mobile-addonsmgr']['enUS_binaryURL'] = \
     MOBILE_BRANCHES['mobile-addonsmgr']['download_base_url'] + '/nightly/latest-mobile-addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['tinderbox_tree'] = 'MozillaTest'
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['slaves'] = MOBILE_SLAVES['linux-gnueabi-arm']
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['slaves'] = MOBILE_SLAVES['maemo4']
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['slaves'] = MOBILE_SLAVES['linux-i686']
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['slaves'] = MOBILE_SLAVES['macosx-i686']
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['slaves'] = MOBILE_SLAVES['win32-i686']
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['env'] = {}
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['env'] = {}
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['env'] = {}
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['env'] = {
     'CHOWN_ROOT': '~/bin/chown_root',
     'CHOWN_REVERT': '~/bin/chown_revert',
 }
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['env'] = {}
 
 #This is needed because we don't use the real branch name as the branch name.
@@ -338,32 +339,32 @@ hacktionary = {'mobile-trunk': 'mozilla-
 #  -workdirs
 #  -upload location
 #  -qt builds use qt mozconfigs
 #  -no QT debs, multilocale, or l10n until bug 555351 is fixed
 for toolkit in ['gtk', 'qt']:
     for branch in MOBILE_BRANCHES.keys():
         if 'qt' in toolkit and '1.9.2' in branch:
                 continue
-        maemo5 = deepcopy(MOBILE_BRANCHES[branch]['platforms']['linux-gnueabi-arm'])
+        maemo5 = deepcopy(MOBILE_BRANCHES[branch]['platforms']['maemo4'])
         maemo5['base_name'] = "Maemo 5 %s %s" % (toolkit.upper(),
                                                  hacktionary.get(branch, branch))
         if 'qt' in toolkit:
             maemo5['glob_list'] = ['dist/*.tar.*', 'dist/*.zip']
             maemo5['debs'] = False
             maemo5['enable_multi_locale'] = False
         elif 'l10n_platforms' in MOBILE_BRANCHES[branch]:
             MOBILE_BRANCHES[branch]['l10n_platforms']['maemo5-%s'%toolkit] = 'linux'
             maemo5['enUS_binaryURL'] = '%s-maemo5-%s' % \
               (MOBILE_BRANCHES[branch]['enUS_binaryURL'], toolkit)
         if 'electrolysis' in branch:
-            maemo5['mozconfig'] += "-%s-e10s" % toolkit
+            maemo5['mozconfig'] = re.sub('maemo4/mobile-[^/]*', 'maemo5-%s/mobile-e10s', maemo5['mozconfig'])
             maemo5['mobile_repo_path'] = 'users/pavlov_mozilla.com/mobile-e10s'
         else:
-            maemo5['mozconfig'] += "-%s" % toolkit
+            maemo5['mozconfig'] = maemo5['mozconfig'].replace('maemo4', 'maemo5-%s' % toolkit)
         maemo5['base_workdir'] = '%s/build/%s-maemo5-%s' % (SBOX_HOME,
                                                             branch, toolkit)
         maemo5['base_builddir'] = '%s-maemo5-%s' % (branch, toolkit)
         maemo5['base_upload_dir'] = '%s-maemo5-%s' % (branch, toolkit)
         maemo5['base_l10n_workdir'] = '%s/build/%s-maemo5-%s-l10n' % (SBOX_HOME,
                                                                       toolkit, branch)
         maemo5['sb_target'] = 'FREMANTLE_ARMEL'
         MOBILE_BRANCHES[branch]['platforms']['maemo5-%s'%toolkit] = maemo5
--- a/mozilla2-staging/mobile_master.py
+++ b/mozilla2-staging/mobile_master.py
@@ -34,17 +34,17 @@ from buildbotcustom.l10n import MultiNig
 import config
 reload(config)
 from config import *
 import mobile_config
 reload(mobile_config)
 from mobile_config import MOBILE_BRANCHES, MOBILE_SLAVES
 
 MOBILE_L10N_SLAVES = {
-    'linux-gnueabi-arm': MOBILE_SLAVES['linux-gnueabi-arm'],
+    'maemo4': MOBILE_SLAVES['maemo4'],
     'maemo5-gtk': MOBILE_SLAVES['maemo5-gtk'],
     'maemo5-qt': MOBILE_SLAVES['maemo5-qt'],
     'linux-i686': MOBILE_SLAVES['linux-i686'],
     'macosx-i686': MOBILE_SLAVES['macosx-i686'],
     'win32-i686': MOBILE_SLAVES['win32-i686'],
     'android-r7': MOBILE_SLAVES['android-r7'],
 }
 
@@ -179,17 +179,17 @@ for name in sorted(MOBILE_BRANCHES.keys(
 
         nightly_builder = '%s nightly' % pf['base_name']
         triggeredSchedulers=None
         if branch['enable_l10n'] and \
            platform in branch['l10n_platforms'] and \
            nightly_builder in l10nNightlyBuilders:
             triggeredSchedulers=[l10nNightlyBuilders[nightly_builder]['l10n_builder']]
 
-        if platform == 'linux-gnueabi-arm' or 'maemo5' in platform:
+        if platform.startswith('maemo'):
             mobile_dep_factory = MaemoBuildFactory(
                 hgHost=mainConfig['hghost'],
                 repoPath=branch['repo_path'],
                 configRepoPath=mainConfig['config_repo_path'],
                 configSubDir=mainConfig['config_subdir'],
                 mozconfig=pf['mozconfig'],
                 stageUsername=mainConfig['stage_username'],
                 stageGroup=mainConfig['stage_group'],
@@ -428,17 +428,17 @@ for name in sorted(MOBILE_BRANCHES.keys(
             'category': name
         }
         if mobile_dep_builder is not None:
             m['builders'].append(mobile_dep_builder)
         m['builders'].append(mobile_nightly_builder)
 
         if branch['enable_l10n'] and platform in branch['l10n_platforms']:
             mobile_l10n_nightly_factory = None
-            if platform in ('linux-gnueabi-arm', 'maemo5-gtk', 'maemo5-qt'):
+            if platform.startswith('maemo'):
                 nightlyBuildDir = pf['base_builddir'] + '-l10n'
                 depBuildDir = pf['base_builddir'] + '-l10n-dep'
                 mobile_l10n_nightly_factory = MaemoNightlyRepackFactory(
                     nightly = True,
                     hgHost=mainConfig['hghost'],
                     tree=branch['l10n_tree'],
                     project=branch['product_name'],
                     appName=branch['app_name'],
--- a/mozilla2-staging/release-fennec-1.0.py
+++ b/mozilla2-staging/release-fennec-1.0.py
@@ -26,20 +26,20 @@ mergeLocales        = True
 # appVersion and oldAppVersion are optional definitions used in places that
 # don't care about what we call it. Eg, when version bumping we will bump to
 # appVersion, not version.
 version             = '1.0.1rc1'
 appVersion          = '1.0.1'
 milestone           = '1.9.2.1'
 buildNumber         = 1
 baseTag             = 'FENNEC_1_0_1rc1'
-enUSPlatforms       = ('maemo',)
+enUSPlatforms       = ('maemo4',)
 l10nPlatforms       = enUSPlatforms
 enUSDesktopPlatforms = ('linux-i686', 'macosx-i686', 'win32-i686')
 l10nDesktopPlatforms = ()
 talosTestPlatforms  = ()
 ftpServer           = 'staging-stage.build.mozilla.org'
 stagingServer       = 'staging-stage.build.mozilla.org'
 stageBasePath       = '/home/ftp/pub/mobile/candidates'
 base_enUS_binaryURL = 'http://%s/pub/mozilla.org/mobile/candidates/%s-candidates/build%d' % (ftpServer, version, buildNumber)
 doPartnerRepacks    = True
 partnersRepoPath    = 'build/partner-repacks'
-partnerRepackPlatforms = ('maemo',)
+partnerRepackPlatforms = ('maemo4',)
--- a/mozilla2-staging/release-fennec-1.1.py
+++ b/mozilla2-staging/release-fennec-1.1.py
@@ -26,20 +26,20 @@ mergeLocales        = True
 # appVersion and oldAppVersion are optional definitions used in places that
 # don't care about what we call it. Eg, when version bumping we will bump to
 # appVersion, not version.
 version             = '1.1b1'
 appVersion          = '1.1'
 milestone           = '1.9.2.3'
 buildNumber         = 1
 baseTag             = 'FENNEC_1_1b1'
-enUSPlatforms       = ('maemo',)
+enUSPlatforms       = ('maemo4',)
 l10nPlatforms       = enUSPlatforms
 enUSDesktopPlatforms = ('linux-i686', 'macosx-i686', 'win32-i686')
 l10nDesktopPlatforms = ()
 talosTestPlatforms  = ()
 ftpServer           = 'staging-stage.build.mozilla.org'
 stagingServer       = 'staging-stage.build.mozilla.org'
 stageBasePath       = '/home/ftp/pub/mobile/candidates'
 base_enUS_binaryURL = 'http://%s/pub/mozilla.org/mobile/candidates/%s-candidates/build%d' % (ftpServer, version, buildNumber)
 doPartnerRepacks    = True
 partnersRepoPath    = 'build/partner-repacks'
-partnerRepackPlatforms = ('maemo',)
+partnerRepackPlatforms = ('maemo4',)
--- a/mozilla2-staging/release_mobile_master.py
+++ b/mozilla2-staging/release_mobile_master.py
@@ -71,25 +71,28 @@ schedulers.append(source_scheduler)
 for platform in enUSPlatforms:
     build_scheduler = Dependent(
         name='%s_build' % platform,
         upstream=tag_scheduler,
         builderNames=['%s_build' % platform]
     )
     schedulers.append(build_scheduler)
     if platform in l10nPlatforms:
+        l10nPlatform = platform
+        if l10nPlatform.startswith('maemo'):
+            l10nPlatform = 'maemo'
         repack_scheduler = DependentL10n(
             name='%s_repack' % platform,
-            platform=platform,
+            platform=l10nPlatform,
             upstream=build_scheduler,
             builderNames=['%s_repack' % platform],
             repoType='hg',
             branch=mobileSourceRepoPath,
             baseTag='%s_RELEASE' % baseTag,
-            locales=platform_locales[platform],
+            locales=platform_locales[l10nPlatform],
             tree='release'
         )
         schedulers.append(repack_scheduler)
 for platform in enUSDesktopPlatforms:
     build_scheduler = Dependent(
         name='mobile_%s_desktop_build' % platform,
         upstream=tag_scheduler,
         builderNames=['mobile_%s_desktop_build' % platform]
@@ -225,20 +228,20 @@ builders.append({
 
 for platform in enUSPlatforms:
 
     baseUploadDir='%s-candidates/build%d' % (version, buildNumber)
     candidatesPath = '%s/%s' % (stageBasePath, baseUploadDir)
     build_factory = None
     repack_factory = None
 
-    if platform == 'maemo':
-        pf = mobileBranchConfig['platforms']['linux-gnueabi-arm']
+    if platform.startswith('maemo'):
+        pf = mobileBranchConfig['platforms'][platform]
         clobberTime = pf.get('clobber_time', branchConfig['default_clobber_time'])
-        mozconfig = 'linux/%s/release' % mobileSourceRepoName
+        mozconfig = 'mobile/%s/%s/release' % (platform, mobileSourceRepoName)
         releaseWorkDir  = pf['base_workdir'] + '-release'
         releaseBuildDir = pf['base_builddir'] + '-release'
         build_factory = MaemoReleaseBuildFactory(
             env=pf['env'],
             hgHost=branchConfig['hghost'],
             repoPath=mozSourceRepoPath,
             configRepoPath=branchConfig['config_repo_path'],
             configSubDir=branchConfig['config_subdir'],
@@ -246,17 +249,17 @@ for platform in enUSPlatforms:
             stageUsername=branchConfig['stage_username'],
             stageServer=branchConfig['stage_server'],
             stageSshKey=branchConfig['stage_ssh_key'],
             stageBasePath=candidatesPath,
             mobileRepoPath=mobileSourceRepoPath,
             mozRevision='%s_RELEASE' % baseTag,
             mobileRevision='%s_RELEASE' % baseTag,
             l10nTag='%s_RELEASE' % baseTag,
-            platform='linux-gnueabi-arm',
+            platform=platform,
             buildsBeforeReboot=pf['builds_before_reboot'],
             baseWorkDir=releaseWorkDir,
             baseBuildDir=releaseBuildDir,
             baseUploadDir=baseUploadDir,
             buildToolsRepoPath=branchConfig['build_tools_repo_path'],
             clobberURL=branchConfig['base_clobber_url'],
             clobberTime=clobberTime,
             buildSpace=10,
@@ -270,26 +273,27 @@ for platform in enUSPlatforms:
         'name': '%s_build' % platform,
         'slavenames': pf['slaves'],
         'category': 'release',
         'builddir': '%s_build' % platform,
         'factory': build_factory
     })
 
     if platform in l10nPlatforms:
-        if platform == 'maemo':
+        if platform.startswith('maemo'):
             releaseBuildDir = pf['base_builddir'] + '-l10n-release'
             repack_factory = MaemoReleaseRepackFactory(
-                enUSBinaryURL='%s/maemo' % (base_enUS_binaryURL),
+                enUSBinaryURL='%s/%s' % (base_enUS_binaryURL, platform),
                 stageServer=branchConfig['stage_server'],
                 stageUsername=branchConfig['stage_username'],
                 stageSshKey=branchConfig['stage_ssh_key'],
-                stageBasePath='%s/%s-candidates/build%d/maemo' % (stageBasePath,
-                                                                  version,
-                                                                  buildNumber),
+                stageBasePath='%s/%s-candidates/build%d/%s' % (stageBasePath,
+                                                               version,
+                                                               buildNumber,
+                                                               platform),
                 baseWorkDir='%s-release' % pf['base_l10n_workdir'],
                 baseBuildDir=releaseBuildDir,
                 l10nTag='%s_RELEASE' % baseTag,
                 hgHost=branchConfig['hghost'],
                 repoPath=mozSourceRepoPath,
                 l10nRepoPath=l10nRepoPath,
                 mobileRepoPath=mobileSourceRepoPath,
                 packageGlobList=['-r', '%(locale)s'],
@@ -302,17 +306,17 @@ for platform in enUSPlatforms:
                 configSubDir=branchConfig['config_subdir'],
                 mozconfig=mozconfig,
                 platform=platform,
                 tree='release'
             )
 
         builders.append({
             'name': '%s_repack' % platform,
-            'slavenames': MOBILE_L10N_SLAVES['linux-gnueabi-arm'],
+            'slavenames': MOBILE_L10N_SLAVES['maemo4'],
             'category': 'release',
             'builddir': '%s_repack' % platform,
             'factory': repack_factory
         })
 for platform in enUSDesktopPlatforms:
     pf = mobileBranchConfig['platforms'][platform]
     clobberTime = pf.get('clobber_time', branchConfig['default_clobber_time'])
     packageGlobList = []
@@ -323,17 +327,17 @@ for platform in enUSDesktopPlatforms:
     elif platform == 'win32-i686':
         packageGlobList = ['-r', 'dist/*.zip']
     
     build_factory = ReleaseMobileDesktopBuildFactory(
         hgHost=branchConfig['hghost'],
         repoPath=mozSourceRepoPath,
         configRepoPath=branchConfig['config_repo_path'],
         configSubDir=branchConfig['config_subdir'],
-        mozconfig=pf['mozconfig'],
+        mozconfig=pf['mozconfig'].replace('nightly', 'release'),
         env=pf['env'],
         stageUsername=branchConfig['stage_username'],
         stageGroup=branchConfig['stage_group'],
         stageSshKey=branchConfig['stage_ssh_key'],
         stageServer=branchConfig['stage_server'],
         stageBasePath='%s/%s' % (candidatesPath, platform),
         mobileRepoPath=mobileSourceRepoPath,
         mozRevision='%s_RELEASE' % baseTag,
@@ -371,17 +375,17 @@ if doPartnerRepacks:
         version=version,
         buildNumber=buildNumber,
         partnersRepoPath=partnersRepoPath,
         stagingServer=stagingServer,
         stageUsername=branchConfig['stage_username'],
         stageSshKey=branchConfig['stage_ssh_key'],
         nightlyDir='candidates',
         platformList=partnerRepackPlatforms,
-        baseWorkDir='%s-partner' % mobileBranchConfig['platforms']['linux-gnueabi-arm']['base_workdir'],
+        baseWorkDir='%s-partner' % mobileBranchConfig['platforms']['maemo4']['base_workdir'],
         python='python2.5',
         packageDmg=False,
         createRemoteStageDir=True
     )
     builders.append({
         'name': 'mobile_partner_repack',
         'slavenames': branchConfig['platforms']['linux']['slaves'],
         'category': 'release',
deleted file mode 100644
--- a/mozilla2-staging/win32/mobile-desktop/nightly/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-# Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-mk_add_options MOZ_PKG_FORMAT=ZIP
-
-export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
-
-# Global options
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-tests
-ac_add_options --enable-jemalloc
-
-ac_add_options --disable-javaxpcom
-ac_add_options --enable-application=mobile
deleted file mode 100644
--- a/mozilla2/android/mobile-browser/nightly/mozconfig
+++ /dev/null
@@ -1,42 +0,0 @@
-mk_add_options JAVAC=/tools/jdk6/bin/javac
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-
-ac_add_options --enable-application=mobile
-
-ac_add_options --disable-ogg
-ac_add_options --disable-wave
-
-ac_add_options --with-arm-kuser
-
-# Global options
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-libxul
-
-# mobile options
-ac_add_options --disable-installer
-ac_add_options --disable-crashreporter
-ac_add_options --disable-printing
-ac_add_options --disable-javaxpcom
-
-# android options
-ac_add_options --target=arm-android-eabi
-
-ac_add_options --with-android-ndk=/tools/android-ndk
-ac_add_options --with-android-sdk=/tools/android-sdk/platforms/android-7
-ac_add_options --with-android-tools=/tools/android-sdk/tools
-
-ac_add_options --with-endian=little
-ac_add_options --enable-tree-freetype
-ac_add_options --enable-faststripe
-
-# other options
-ac_add_options --disable-necko-wifi
-ac_add_options --disable-plugins
-
-# to fix
-#ac_add_options --disable-crypto
-# ssltunnel can't build if we disable crypto
-
-ac_add_options --disable-tests
-
deleted file mode 100644
--- a/mozilla2/linux/mobile-browser/nightly-gtk-e10s/mozconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-#ac_add_options --with-qtdir=/opt/qt4-maemo5
-
-mk_add_options MOZ_MAKE_FLAGS=-j9
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-
-#ac_add_options --enable-debug
-#ac_add_options --disable-optimize
-
-ac_add_options --enable-application=mobile
-ac_add_options --with-arm-kuser
-ac_add_options --enable-ipc
-
-ac_add_options --with-maemo-version=5
deleted file mode 100644
--- a/mozilla2/linux/mobile-browser/nightly-gtk/mozconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-#ac_add_options --with-qtdir=/opt/qt4-maemo5
-
-mk_add_options MOZ_MAKE_FLAGS=-j9
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-
-#ac_add_options --enable-debug
-#ac_add_options --disable-optimize
-
-ac_add_options --enable-application=mobile
-ac_add_options --with-arm-kuser
-#ac_add_options --enable-ipc
-
-ac_add_options --with-maemo-version=5
-ac_add_options --enable-debug-symbols
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/linux/mobile-browser/nightly-qt-e10s/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-#ac_add_options --with-qtdir=/opt/qt4-maemo5
-
-mk_add_options MOZ_MAKE_FLAGS=-j9
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-
-#ac_add_options --enable-debug
-#ac_add_options --disable-optimize
-
-ac_add_options --enable-application=mobile
-ac_add_options --with-arm-kuser
-ac_add_options --enable-ipc
-ac_add_options --enable-default-toolkit=cairo-qt
-ac_add_options --disable-crashreporter
-
-ac_add_options --with-maemo-version=5
deleted file mode 100644
--- a/mozilla2/linux/mobile-browser/nightly-qt/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-#ac_add_options --with-qtdir=/opt/qt4-maemo5
-
-mk_add_options MOZ_MAKE_FLAGS=-j9
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-
-#ac_add_options --enable-debug
-#ac_add_options --disable-optimize
-
-ac_add_options --enable-application=mobile
-ac_add_options --with-arm-kuser
-#ac_add_options --enable-ipc
-ac_add_options --enable-default-toolkit=cairo-qt
-ac_add_options --disable-crashreporter
-
-ac_add_options --with-maemo-version=5
deleted file mode 100644
--- a/mozilla2/linux/mobile-browser/nightly/mozconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-
-export LDFLAGS='-Wl,-rpath-link,/usr/lib:/lib'
-
-ac_add_options --with-maemo-version=5
-
-# install locations for Maemo
-ac_add_options --prefix=/opt/mozilla
-ac_add_options --libdir=/opt/mozilla
-
-ac_add_options --disable-javaxpcom
-ac_add_options --with-arm-kuser
-# updater isn't used for Maemo
-ac_add_options --disable-updater
-ac_add_options --enable-application=mobile
-ac_add_options --disable-ipc
-ac_add_options --enable-debug-symbols
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
deleted file mode 100644
--- a/mozilla2/linux/mobile-browser/release/mozconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-
-export LDFLAGS='-Wl,-rpath-link,/usr/lib:/lib'
-
-ac_add_options --with-maemo-version=5
-
-# install locations for Maemo
-ac_add_options --prefix=/opt/mozilla
-ac_add_options --libdir=/opt/mozilla
-
-ac_add_options --disable-javaxpcom
-ac_add_options --with-arm-kuser
-# updater isn't used for Maemo
-ac_add_options --disable-updater
-ac_add_options --disable-ipc
-ac_add_options --enable-application=mobile
-ac_add_options --enable-official-branding
deleted file mode 100644
--- a/mozilla2/linux/mobile-desktop/nightly/mozconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-mk_add_options MOZ_PKG_FORMAT=BZ2
-ac_add_options --disable-javaxpcom
-ac_add_options --enable-application=mobile
-
-CC=/tools/gcc-4.3.3/installed/bin/gcc
-CXX=/tools/gcc-4.3.3/installed/bin/g++
deleted file mode 100644
--- a/mozilla2/linux64/mobile-browser/nightly/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile"
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-
-export LDFLAGS='-Wl,-rpath-link,/usr/lib:/lib'
-
-ac_add_options --disable-javaxpcom
-
-ac_add_app_options xulrunner --with-arm-kuser
-ac_add_app_options xulrunner --enable-application=xulrunner
-
-ac_add_app_options mobile --enable-application=mobile
-ac_add_app_options mobile --with-libxul-sdk=../xulrunner/dist
-
-ac_add_options --enable-tests
deleted file mode 100644
--- a/mozilla2/linux64/mobile-desktop/nightly/mozconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-mk_add_options MOZ_BUILD_PROJECTS="xulrunner mobile"
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-mk_add_options MOZ_PKG_FORMAT=BZ2
-ac_add_options --disable-javaxpcom
-ac_add_app_options xulrunner --enable-application=xulrunner
-ac_add_app_options mobile --enable-application=mobile
-ac_add_app_options mobile --with-libxul-sdk=../xulrunner/dist
-
-CC=/tools/gcc-4.3.3/installed/bin/gcc
-CXX=/tools/gcc-4.3.3/installed/bin/g++
deleted file mode 100644
--- a/mozilla2/macosx/mobile-desktop/nightly/mozconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-mk_add_options AUTOCONF=autoconf213
-
-# Global options
-ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
-ac_cv_visibility_pragma=no
-
-# Debug Build Setup Options
-ac_add_options --enable-optimize
-ac_add_options --disable-debug
-ac_add_options --disable-install-strip
-
-ac_add_options --disable-installer
-ac_add_options --enable-application=mobile
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/android/mobile-browser/nightly/mozconfig
@@ -0,0 +1,42 @@
+mk_add_options JAVAC=/tools/jdk6/bin/javac
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+ac_add_options --enable-application=mobile
+
+ac_add_options --disable-ogg
+ac_add_options --disable-wave
+
+ac_add_options --with-arm-kuser
+
+# Global options
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+ac_add_options --enable-libxul
+
+# mobile options
+ac_add_options --disable-installer
+ac_add_options --disable-crashreporter
+ac_add_options --disable-printing
+ac_add_options --disable-javaxpcom
+
+# android options
+ac_add_options --target=arm-android-eabi
+
+ac_add_options --with-android-ndk=/tools/android-ndk
+ac_add_options --with-android-sdk=/tools/android-sdk/platforms/android-7
+ac_add_options --with-android-tools=/tools/android-sdk/tools
+
+ac_add_options --with-endian=little
+ac_add_options --enable-tree-freetype
+ac_add_options --enable-faststripe
+
+# other options
+ac_add_options --disable-necko-wifi
+ac_add_options --disable-plugins
+
+# to fix
+#ac_add_options --disable-crypto
+# ssltunnel can't build if we disable crypto
+
+ac_add_options --disable-tests
+
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/linux-i686/mobile-1.1/nightly/mozconfig
@@ -0,0 +1,7 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_PKG_FORMAT=BZ2
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=mobile
+
+CC=/tools/gcc-4.3.3/installed/bin/gcc
+CXX=/tools/gcc-4.3.3/installed/bin/g++
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/linux-i686/mobile-1.1/release/mozconfig
@@ -0,0 +1,7 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_PKG_FORMAT=BZ2
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=mobile
+
+CC=/tools/gcc-4.3.3/installed/bin/gcc
+CXX=/tools/gcc-4.3.3/installed/bin/g++
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/linux-i686/mobile-browser/nightly/mozconfig
@@ -0,0 +1,7 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_PKG_FORMAT=BZ2
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=mobile
+
+CC=/tools/gcc-4.3.3/installed/bin/gcc
+CXX=/tools/gcc-4.3.3/installed/bin/g++
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/linux-i686/mobile-browser/release/mozconfig
@@ -0,0 +1,7 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_PKG_FORMAT=BZ2
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=mobile
+
+CC=/tools/gcc-4.3.3/installed/bin/gcc
+CXX=/tools/gcc-4.3.3/installed/bin/g++
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/macosx-i686/mobile-1.1/nightly/mozconfig
@@ -0,0 +1,15 @@
+# Options for client.mk.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options AUTOCONF=autoconf213
+
+# Global options
+ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
+ac_cv_visibility_pragma=no
+
+# Debug Build Setup Options
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --disable-install-strip
+
+ac_add_options --disable-installer
+ac_add_options --enable-application=mobile
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/macosx-i686/mobile-1.1/release/mozconfig
@@ -0,0 +1,15 @@
+# Options for client.mk.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options AUTOCONF=autoconf213
+
+# Global options
+ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
+ac_cv_visibility_pragma=no
+
+# Debug Build Setup Options
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --disable-install-strip
+
+ac_add_options --disable-installer
+ac_add_options --enable-application=mobile
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/macosx-i686/mobile-browser/nightly/mozconfig
@@ -0,0 +1,15 @@
+# Options for client.mk.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options AUTOCONF=autoconf213
+
+# Global options
+ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
+ac_cv_visibility_pragma=no
+
+# Debug Build Setup Options
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --disable-install-strip
+
+ac_add_options --disable-installer
+ac_add_options --enable-application=mobile
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/macosx-i686/mobile-browser/release/mozconfig
@@ -0,0 +1,15 @@
+# Options for client.mk.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options AUTOCONF=autoconf213
+
+# Global options
+ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.5.sdk
+ac_cv_visibility_pragma=no
+
+# Debug Build Setup Options
+ac_add_options --enable-optimize
+ac_add_options --disable-debug
+ac_add_options --disable-install-strip
+
+ac_add_options --disable-installer
+ac_add_options --enable-application=mobile
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/maemo4/mobile-1.1/nightly/mozconfig
@@ -0,0 +1,20 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+export LDFLAGS='-Wl,-rpath-link,/usr/lib:/lib'
+
+ac_add_options --with-maemo-version=5
+
+# install locations for Maemo
+ac_add_options --prefix=/opt/mozilla
+ac_add_options --libdir=/opt/mozilla
+
+ac_add_options --disable-javaxpcom
+ac_add_options --with-arm-kuser
+# updater isn't used for Maemo
+ac_add_options --disable-updater
+ac_add_options --enable-application=mobile
+ac_add_options --disable-ipc
+ac_add_options --enable-debug-symbols
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/maemo4/mobile-1.1/release/mozconfig
@@ -0,0 +1,17 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+export LDFLAGS='-Wl,-rpath-link,/usr/lib:/lib'
+
+ac_add_options --with-maemo-version=5
+
+# install locations for Maemo
+ac_add_options --prefix=/opt/mozilla
+ac_add_options --libdir=/opt/mozilla
+
+ac_add_options --disable-javaxpcom
+ac_add_options --with-arm-kuser
+# updater isn't used for Maemo
+ac_add_options --disable-updater
+ac_add_options --disable-ipc
+ac_add_options --enable-application=mobile
+ac_add_options --enable-official-branding
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/maemo4/mobile-browser/nightly/mozconfig
@@ -0,0 +1,20 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+export LDFLAGS='-Wl,-rpath-link,/usr/lib:/lib'
+
+ac_add_options --with-maemo-version=5
+
+# install locations for Maemo
+ac_add_options --prefix=/opt/mozilla
+ac_add_options --libdir=/opt/mozilla
+
+ac_add_options --disable-javaxpcom
+ac_add_options --with-arm-kuser
+# updater isn't used for Maemo
+ac_add_options --disable-updater
+ac_add_options --enable-application=mobile
+ac_add_options --disable-ipc
+ac_add_options --enable-debug-symbols
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/maemo4/mobile-browser/release/mozconfig
@@ -0,0 +1,17 @@
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+export LDFLAGS='-Wl,-rpath-link,/usr/lib:/lib'
+
+ac_add_options --with-maemo-version=5
+
+# install locations for Maemo
+ac_add_options --prefix=/opt/mozilla
+ac_add_options --libdir=/opt/mozilla
+
+ac_add_options --disable-javaxpcom
+ac_add_options --with-arm-kuser
+# updater isn't used for Maemo
+ac_add_options --disable-updater
+ac_add_options --disable-ipc
+ac_add_options --enable-application=mobile
+ac_add_options --enable-official-branding
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/maemo5-gtk/mobile-1.1/nightly/mozconfig
@@ -0,0 +1,17 @@
+#ac_add_options --with-qtdir=/opt/qt4-maemo5
+
+mk_add_options MOZ_MAKE_FLAGS=-j9
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+
+ac_add_options --enable-application=mobile
+ac_add_options --with-arm-kuser
+#ac_add_options --enable-ipc
+
+ac_add_options --with-maemo-version=5
+ac_add_options --enable-debug-symbols
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/maemo5-gtk/mobile-1.1/release/mozconfig
@@ -0,0 +1,17 @@
+#ac_add_options --with-qtdir=/opt/qt4-maemo5
+
+mk_add_options MOZ_MAKE_FLAGS=-j9
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+
+ac_add_options --enable-application=mobile
+ac_add_options --with-arm-kuser
+#ac_add_options --enable-ipc
+
+ac_add_options --with-maemo-version=5
+ac_add_options --enable-debug-symbols
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/maemo5-gtk/mobile-browser/nightly/mozconfig
@@ -0,0 +1,17 @@
+#ac_add_options --with-qtdir=/opt/qt4-maemo5
+
+mk_add_options MOZ_MAKE_FLAGS=-j9
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+
+ac_add_options --enable-application=mobile
+ac_add_options --with-arm-kuser
+#ac_add_options --enable-ipc
+
+ac_add_options --with-maemo-version=5
+ac_add_options --enable-debug-symbols
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/maemo5-gtk/mobile-browser/release/mozconfig
@@ -0,0 +1,17 @@
+#ac_add_options --with-qtdir=/opt/qt4-maemo5
+
+mk_add_options MOZ_MAKE_FLAGS=-j9
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+
+ac_add_options --enable-application=mobile
+ac_add_options --with-arm-kuser
+#ac_add_options --enable-ipc
+
+ac_add_options --with-maemo-version=5
+ac_add_options --enable-debug-symbols
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/maemo5-gtk/mobile-e10s/nightly/mozconfig
@@ -0,0 +1,13 @@
+#ac_add_options --with-qtdir=/opt/qt4-maemo5
+
+mk_add_options MOZ_MAKE_FLAGS=-j9
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+
+ac_add_options --enable-application=mobile
+ac_add_options --with-arm-kuser
+ac_add_options --enable-ipc
+
+ac_add_options --with-maemo-version=5
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/maemo5-qt/mobile-browser/nightly/mozconfig
@@ -0,0 +1,15 @@
+#ac_add_options --with-qtdir=/opt/qt4-maemo5
+
+mk_add_options MOZ_MAKE_FLAGS=-j9
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+
+ac_add_options --enable-application=mobile
+ac_add_options --with-arm-kuser
+#ac_add_options --enable-ipc
+ac_add_options --enable-default-toolkit=cairo-qt
+ac_add_options --disable-crashreporter
+
+ac_add_options --with-maemo-version=5
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/maemo5-qt/mobile-e10s/nightly/mozconfig
@@ -0,0 +1,15 @@
+#ac_add_options --with-qtdir=/opt/qt4-maemo5
+
+mk_add_options MOZ_MAKE_FLAGS=-j9
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+
+#ac_add_options --enable-debug
+#ac_add_options --disable-optimize
+
+ac_add_options --enable-application=mobile
+ac_add_options --with-arm-kuser
+ac_add_options --enable-ipc
+ac_add_options --enable-default-toolkit=cairo-qt
+ac_add_options --disable-crashreporter
+
+ac_add_options --with-maemo-version=5
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/win32-i686/mobile-1.1/nightly/mozconfig
@@ -0,0 +1,14 @@
+# Options for client.mk.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_PKG_FORMAT=ZIP
+
+export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
+
+# Global options
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+ac_add_options --enable-tests
+ac_add_options --enable-jemalloc
+
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=mobile
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/win32-i686/mobile-1.1/release/mozconfig
@@ -0,0 +1,14 @@
+# Options for client.mk.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_PKG_FORMAT=ZIP
+
+export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
+
+# Global options
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+ac_add_options --enable-tests
+ac_add_options --enable-jemalloc
+
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=mobile
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/win32-i686/mobile-browser/nightly/mozconfig
@@ -0,0 +1,14 @@
+# Options for client.mk.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_PKG_FORMAT=ZIP
+
+export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
+
+# Global options
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+ac_add_options --enable-tests
+ac_add_options --enable-jemalloc
+
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=mobile
new file mode 100644
--- /dev/null
+++ b/mozilla2/mobile/win32-i686/mobile-browser/release/mozconfig
@@ -0,0 +1,14 @@
+# Options for client.mk.
+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
+mk_add_options MOZ_PKG_FORMAT=ZIP
+
+export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
+
+# Global options
+ac_add_options --disable-debug
+ac_add_options --enable-optimize
+ac_add_options --enable-tests
+ac_add_options --enable-jemalloc
+
+ac_add_options --disable-javaxpcom
+ac_add_options --enable-application=mobile
--- a/mozilla2/mobile_config.py
+++ b/mozilla2/mobile_config.py
@@ -1,25 +1,26 @@
 # -*- python -*-
 # ex: set syntax=python:
 
 from copy import deepcopy
+import re
 
 import config
 reload(config)
 
 import buildbotcustom.env
 reload(buildbotcustom.env)
 from buildbotcustom.env import MozillaEnvironments
 
 OBJDIR = 'objdir'
 SBOX_HOME = '/scratchbox/users/cltbld/home/cltbld'
 
 MOBILE_SLAVES = {
-    'linux-gnueabi-arm': config.SLAVES['linux'],
+    'maemo4': config.SLAVES['linux'],
     'maemo5-gtk': config.SLAVES['linux'],
     'maemo5-qt': config.SLAVES['linux'],
     'linux-i686': config.SLAVES['linux'],
     'macosx-i686': config.SLAVES['macosx'],
     'win32-i686': config.SLAVES['win32'],
 }
 
 MOBILE_BRANCHES = {
@@ -37,73 +38,73 @@ MOBILE_BRANCHES['mobile-trunk']['l10n_re
 MOBILE_BRANCHES['mobile-trunk']['mobile_repo_path'] = 'mobile-browser'
 MOBILE_BRANCHES['mobile-trunk']['product_name'] = 'fennec'
 MOBILE_BRANCHES['mobile-trunk']['app_name'] = 'mobile'
 MOBILE_BRANCHES['mobile-trunk']['aus2_base_upload_dir'] = '/opt/aus2/build/0/{a23983c0-fd0e-11dc-95ff-0800200c9a66}/mozilla-central'
 MOBILE_BRANCHES['mobile-trunk']['download_base_url'] = 'http://stage.mozilla.org/pub/mozilla.org/mobile'
 MOBILE_BRANCHES['mobile-trunk']['stage_base_path'] = '/home/ftp/pub/mobile'
 MOBILE_BRANCHES['mobile-trunk']['mail_on_failure'] = True
 MOBILE_BRANCHES['mobile-trunk']['platforms'] = {
-    'linux-gnueabi-arm': {},
+    'maemo4': {},
     'linux-i686': {},
     'macosx-i686': {},
     'win32-i686': {},
 }
 MOBILE_BRANCHES['mobile-trunk']['l10n_platforms'] = {}
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['sb_target'] = 'CHINOOK-ARMEL-2007'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['mozconfig'] = 'linux/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['mozconfig'] = 'macosx/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['mozconfig'] = 'win32/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo mozilla-central'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['mozconfig'] = 'mobile/maemo4/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['sb_target'] = 'CHINOOK-ARMEL-2007'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['mozconfig'] = 'mobile/linux-i686/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['mozconfig'] = 'mobile/macosx-i686/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['mozconfig'] = 'mobile/win32-i686/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['base_name'] = 'Maemo mozilla-central'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_name'] = 'Linux Fennec Desktop mozilla-central'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['base_name'] = 'OS X Fennec Desktop mozilla-central'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['base_name'] = 'Win32 Fennec Desktop mozilla-central'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['build_space'] = 5
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['build_space'] = 5
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['build_space'] = 5
 MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['build_space'] = 5
 MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['build_space'] = 5
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['builds_before_reboot'] = 1
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['builds_before_reboot'] = 1
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['builds_before_reboot'] = 1
 MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['builds_before_reboot'] = 1
 MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['builds_before_reboot'] = 1
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build/maemo-trunk' % SBOX_HOME
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-trunk'
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['base_workdir'] = '%s/build/maemo-trunk' % SBOX_HOME
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['base_builddir'] = 'maemo-trunk'
 # This base directory is for the individual locales repackaging; it is not for the multi-locale build
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['base_l10n_workdir'] = '%s/build/maemo-trunk-l10n' % SBOX_HOME
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['base_l10n_workdir'] = '%s/build/maemo-trunk-l10n' % SBOX_HOME
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_builddir'] = 'linux-fennec-trunk'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['base_l10n_workdir'] = 'build/linux-fennec-trunk-l10n'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['base_builddir'] = 'macosx-fennec-trunk'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['base_l10n_workdir'] = 'build/macosx-fennec-trunk-l10n'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['base_workdir'] = '.'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['base_builddir'] = 'w32mob-trunk'
 MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['base_l10n_workdir'] = 'w32mob-trunk-l10n'
 MOBILE_BRANCHES['mobile-trunk']['enable_l10n'] = True 
 MOBILE_BRANCHES['mobile-trunk']['enable_l10n_onchange'] = False 
 MOBILE_BRANCHES['mobile-trunk']['enable_multi_locale'] = True
 MOBILE_BRANCHES['mobile-trunk']['l10n_tree'] = 'fennec_mc'
-MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['linux-gnueabi-arm'] = 'linux'
+MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['maemo4'] = 'linux'
 MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['linux-i686'] = 'linux'
 #MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['macosx-i686'] = 'macosx'
 MOBILE_BRANCHES['mobile-trunk']['l10n_platforms']['win32-i686'] = 'win32'
 MOBILE_BRANCHES['mobile-trunk']['allLocalesFile'] = "locales/all-locales"
 MOBILE_BRANCHES['mobile-trunk']['multiLocalesFile'] = "locales/maemo-locales"
 MOBILE_BRANCHES['mobile-trunk']['l10nUploadPath'] = \
     '/home/ftp/pub/mozilla.org/mobile/nightly/latest-mobile-trunk-l10n'
 MOBILE_BRANCHES['mobile-trunk']['enUS_binaryURL'] = \
     MOBILE_BRANCHES['mobile-trunk']['download_base_url'] + '/nightly/latest-mobile-trunk'
 MOBILE_BRANCHES['mobile-trunk']['tinderbox_tree'] = 'Mobile'
 MOBILE_BRANCHES['mobile-trunk']['l10n_tinderbox_tree'] = 'Mozilla-l10n'
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['slaves'] = MOBILE_SLAVES['linux-gnueabi-arm']
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['slaves'] = MOBILE_SLAVES['maemo4']
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['slaves'] = MOBILE_SLAVES['linux-i686']
 MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['slaves'] = MOBILE_SLAVES['macosx-i686']
 MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['slaves'] = MOBILE_SLAVES['win32-i686']
-MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-gnueabi-arm']['env'] = {}
+MOBILE_BRANCHES['mobile-trunk']['platforms']['maemo4']['env'] = {}
 MOBILE_BRANCHES['mobile-trunk']['platforms']['linux-i686']['env'] = {}
 MOBILE_BRANCHES['mobile-trunk']['platforms']['macosx-i686']['env'] = {
     'CHOWN_ROOT': '~/bin/chown_root',
     'CHOWN_REVERT': '~/bin/chown_revert',
 }
 MOBILE_BRANCHES['mobile-trunk']['platforms']['win32-i686']['env'] = {}
 
 ### mobile-1.9.2
@@ -113,73 +114,73 @@ MOBILE_BRANCHES['mobile-1.9.2']['l10n_re
 MOBILE_BRANCHES['mobile-1.9.2']['mobile_repo_path'] = 'releases/mobile-1.1'
 MOBILE_BRANCHES['mobile-1.9.2']['product_name'] = 'fennec'
 MOBILE_BRANCHES['mobile-1.9.2']['app_name'] = 'mobile'
 MOBILE_BRANCHES['mobile-1.9.2']['aus2_base_upload_dir'] = '/opt/aus2/build/0/{a23983c0-fd0e-11dc-95ff-0800200c9a66}/mozilla-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['download_base_url'] = 'http://stage.mozilla.org/pub/mozilla.org/mobile'
 MOBILE_BRANCHES['mobile-1.9.2']['stage_base_path'] = '/home/ftp/pub/mobile'
 MOBILE_BRANCHES['mobile-1.9.2']['mail_on_failure'] = True
 MOBILE_BRANCHES['mobile-1.9.2']['platforms'] = {
-    'linux-gnueabi-arm': {},
+    'maemo4': {},
     'linux-i686': {},
     'macosx-i686': {},
     'win32-i686': {},
 }
 MOBILE_BRANCHES['mobile-1.9.2']['l10n_platforms'] = {}
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['sb_target'] = 'CHINOOK-ARMEL-2007'
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['mozconfig'] = 'linux/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['mozconfig'] = 'macosx/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['mozconfig'] = 'win32/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo mozilla-1.9.2'
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['mozconfig'] = 'mobile/maemo4/mobile-1.1/nightly'
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['sb_target'] = 'CHINOOK-ARMEL-2007'
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['mozconfig'] = 'mobile/linux-i686/mobile-1.1/nightly'
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['mozconfig'] = 'mobile/macosx-i686/mobile-1.1/nightly'
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['mozconfig'] = 'mobile/win32-i686/mobile-1.1/nightly'
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['base_name'] = 'Maemo mozilla-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['base_name'] = 'Linux Fennec Desktop mozilla-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['base_name'] = 'OS X Fennec Desktop mozilla-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['base_name'] = 'Win32 Fennec Desktop mozilla-1.9.2'
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['build_space'] = 5
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['build_space'] = 5
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['build_space'] = 5
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['build_space'] = 5
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['build_space'] = 5
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['builds_before_reboot'] = 1
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['builds_before_reboot'] = 1
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['builds_before_reboot'] = 1
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['builds_before_reboot'] = 1
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['builds_before_reboot'] = 1
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build/maemo-1.9.2' % SBOX_HOME
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-1.9.2'
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['base_workdir'] = '%s/build/maemo-1.9.2' % SBOX_HOME
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['base_builddir'] = 'maemo-1.9.2'
 # This base directory is for the individual locales repackaging; it is not for the multi-locale build
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['base_l10n_workdir'] = '%s/build/maemo-1.9.2-l10n' % SBOX_HOME
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['base_l10n_workdir'] = '%s/build/maemo-1.9.2-l10n' % SBOX_HOME
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['base_builddir'] = 'linux-fennec-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['base_l10n_workdir'] = 'build/linux-fennec-1.9.2-l10n'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['base_builddir'] = 'macosx-fennec-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['base_l10n_workdir'] = 'build/macosx-fennec-1.9.2-l10n'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['base_workdir'] = '.'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['base_builddir'] = 'w32mob-1.9.2'
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['base_l10n_workdir'] = 'w32mob-1.9.2-l10n'
 MOBILE_BRANCHES['mobile-1.9.2']['enable_l10n'] = True 
 MOBILE_BRANCHES['mobile-1.9.2']['enable_l10n_onchange'] = False 
 MOBILE_BRANCHES['mobile-1.9.2']['enable_multi_locale'] = True
 MOBILE_BRANCHES['mobile-1.9.2']['l10n_tree'] = 'fennec11x'
-MOBILE_BRANCHES['mobile-1.9.2']['l10n_platforms']['linux-gnueabi-arm'] = 'linux'
+MOBILE_BRANCHES['mobile-1.9.2']['l10n_platforms']['maemo4'] = 'linux'
 MOBILE_BRANCHES['mobile-1.9.2']['l10n_platforms']['linux-i686'] = 'linux'
 #MOBILE_BRANCHES['mobile-1.9.2']['l10n_platforms']['macosx-i686'] = 'macosx'
 MOBILE_BRANCHES['mobile-1.9.2']['l10n_platforms']['win32-i686'] = 'win32'
 MOBILE_BRANCHES['mobile-1.9.2']['allLocalesFile'] = "locales/all-locales"
 MOBILE_BRANCHES['mobile-1.9.2']['multiLocalesFile'] = "locales/maemo-locales"
 MOBILE_BRANCHES['mobile-1.9.2']['l10nUploadPath'] = \
     '/home/ftp/pub/mozilla.org/mobile/nightly/latest-mobile-1.9.2-l10n'
 MOBILE_BRANCHES['mobile-1.9.2']['tinderbox_tree'] = 'Mobile1.1'
 MOBILE_BRANCHES['mobile-1.9.2']['l10n_tinderbox_tree'] = 'Mozilla-l10n'
 MOBILE_BRANCHES['mobile-1.9.2']['enUS_binaryURL'] = \
     MOBILE_BRANCHES['mobile-1.9.2']['download_base_url'] + '/nightly/latest-mobile-1.9.2'
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['slaves'] = MOBILE_SLAVES['linux-gnueabi-arm']
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['slaves'] = MOBILE_SLAVES['maemo4']
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['slaves'] = MOBILE_SLAVES['linux-i686']
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['slaves'] = MOBILE_SLAVES['macosx-i686']
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['slaves'] = MOBILE_SLAVES['win32-i686']
-MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-gnueabi-arm']['env'] = {}
+MOBILE_BRANCHES['mobile-1.9.2']['platforms']['maemo4']['env'] = {}
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['linux-i686']['env'] = {}
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['macosx-i686']['env'] = {
     'CHOWN_ROOT': '~/bin/chown_root',
     'CHOWN_REVERT': '~/bin/chown_revert',
 }
 MOBILE_BRANCHES['mobile-1.9.2']['platforms']['win32-i686']['env'] = {}
 
 ### mobile-tracemonkey
@@ -188,131 +189,131 @@ MOBILE_BRANCHES['mobile-tracemonkey']['r
 MOBILE_BRANCHES['mobile-tracemonkey']['l10n_repo_path'] = 'l10n-central'
 MOBILE_BRANCHES['mobile-tracemonkey']['mobile_repo_path'] = 'mobile-browser'
 MOBILE_BRANCHES['mobile-tracemonkey']['product_name'] = 'fennec'
 MOBILE_BRANCHES['mobile-tracemonkey']['app_name'] = 'mobile'
 MOBILE_BRANCHES['mobile-tracemonkey']['aus2_base_upload_dir'] = None
 MOBILE_BRANCHES['mobile-tracemonkey']['download_base_url'] = 'http://stage.mozilla.org/pub/mozilla.org/mobile'
 MOBILE_BRANCHES['mobile-tracemonkey']['stage_base_path'] = '/home/ftp/pub/mobile'
 MOBILE_BRANCHES['mobile-tracemonkey']['platforms'] = {
-    'linux-gnueabi-arm': {},
+    'maemo4': {},
 }
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['sb_target'] = 'CHINOOK-ARMEL-2007'
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo Tracemonkey'
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['build_space'] = 5
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['builds_before_reboot'] = 1
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build/maemo-tracemonkey' % SBOX_HOME
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-tracemonkey'
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['mozconfig'] = 'mobile/maemo4/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['sb_target'] = 'CHINOOK-ARMEL-2007'
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['base_name'] = 'Maemo Tracemonkey'
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['build_space'] = 5
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['builds_before_reboot'] = 1
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['base_workdir'] = '%s/build/maemo-tracemonkey' % SBOX_HOME
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['base_builddir'] = 'maemo-tracemonkey'
 MOBILE_BRANCHES['mobile-tracemonkey']['enable_l10n'] = False
 MOBILE_BRANCHES['mobile-tracemonkey']['enable_l10n_onchange'] = False
 MOBILE_BRANCHES['mobile-tracemonkey']['enable_multi_locale'] = False
 MOBILE_BRANCHES['mobile-tracemonkey']['tinderbox_tree'] = 'TraceMonkey'
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['slaves'] = MOBILE_SLAVES['linux-gnueabi-arm']
-MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['linux-gnueabi-arm']['env'] = {}
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['slaves'] = MOBILE_SLAVES['maemo4']
+MOBILE_BRANCHES['mobile-tracemonkey']['platforms']['maemo4']['env'] = {}
 
 ### electrolysis
 MOBILE_BRANCHES['mobile-electrolysis']['main_config'] = config.BRANCHES['electrolysis']
 MOBILE_BRANCHES['mobile-electrolysis']['repo_path'] = 'projects/electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['l10n_repo_path'] = 'l10n-central'
 MOBILE_BRANCHES['mobile-electrolysis']['mobile_repo_path'] = 'mobile-browser'
 MOBILE_BRANCHES['mobile-electrolysis']['product_name'] = 'fennec'
 MOBILE_BRANCHES['mobile-electrolysis']['app_name'] = 'mobile'
 MOBILE_BRANCHES['mobile-electrolysis']['aus2_base_upload_dir'] = None
 MOBILE_BRANCHES['mobile-electrolysis']['download_base_url'] = 'http://stage.mozilla.org/pub/mozilla.org/mobile'
 MOBILE_BRANCHES['mobile-electrolysis']['stage_base_path'] = '/home/ftp/pub/mobile'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms'] = {
-    'linux-gnueabi-arm': {},
+    'maemo4': {},
     'linux-i686': {},
 }
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['sb_target'] = 'CHINOOK-ARMEL-2007'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['mozconfig'] = 'linux/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo electrolysis'
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['mozconfig'] = 'mobile/maemo4/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['sb_target'] = 'CHINOOK-ARMEL-2007'
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['mozconfig'] = 'mobile/linux-i686/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['base_name'] = 'Maemo electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_name'] = 'Linux Fennec Desktop electrolysis'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['build_space'] = 5
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['build_space'] = 5
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['build_space'] = 5
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['builds_before_reboot'] = 1
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['builds_before_reboot'] = 1
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['builds_before_reboot'] = 1
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build/maemo-electrolysis' % SBOX_HOME
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-electrolysis'
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['base_workdir'] = '%s/build/maemo-electrolysis' % SBOX_HOME
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['base_builddir'] = 'maemo-electrolysis'
 # This base directory is for the individual locales repackaging; it is not for the multi-locale build
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['base_l10n_workdir'] = '%s/build/maemo-electrolysis-l10n' % SBOX_HOME
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['base_l10n_workdir'] = '%s/build/maemo-electrolysis-l10n' % SBOX_HOME
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_builddir'] = 'linux-fennec-electrolysis'
 # This base directory is for the individual locales repackaging; it is not for the multi-locale build
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['base_l10n_workdir'] = 'build/linux-fennec-electrolysis-l10n'
 MOBILE_BRANCHES['mobile-electrolysis']['enable_l10n'] = False
 MOBILE_BRANCHES['mobile-electrolysis']['enable_l10n_onchange'] = False
 MOBILE_BRANCHES['mobile-electrolysis']['enable_multi_locale'] = False
 MOBILE_BRANCHES['mobile-electrolysis']['enUS_binaryURL'] = \
     MOBILE_BRANCHES['mobile-electrolysis']['download_base_url'] + '/nightly/latest-mobile-electrolysis'
 MOBILE_BRANCHES['mobile-electrolysis']['tinderbox_tree'] = 'Electrolysis'
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['slaves'] = MOBILE_SLAVES['linux-gnueabi-arm']
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['slaves'] = MOBILE_SLAVES['maemo4']
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['slaves'] = MOBILE_SLAVES['linux-i686']
-MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-gnueabi-arm']['env'] = {}
+MOBILE_BRANCHES['mobile-electrolysis']['platforms']['maemo4']['env'] = {}
 MOBILE_BRANCHES['mobile-electrolysis']['platforms']['linux-i686']['env'] = {}
 
 ### mozilla-addonsmgr
 MOBILE_BRANCHES['mobile-addonsmgr']['main_config'] = config.BRANCHES['addonsmgr']
 MOBILE_BRANCHES['mobile-addonsmgr']['repo_path'] = 'projects/addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['l10n_repo_path'] = 'l10n-central'
 MOBILE_BRANCHES['mobile-addonsmgr']['mobile_repo_path'] = 'mobile-browser'
 MOBILE_BRANCHES['mobile-addonsmgr']['product_name'] = 'fennec'
 MOBILE_BRANCHES['mobile-addonsmgr']['app_name'] = 'mobile'
 MOBILE_BRANCHES['mobile-addonsmgr']['aus2_base_upload_dir'] = '/opt/aus2/build/0/{a23983c0-fd0e-11dc-95ff-0800200c9a66}/addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['download_base_url'] = 'http://stage.build.mozilla.org/pub/mozilla.org/mobile'
 MOBILE_BRANCHES['mobile-addonsmgr']['stage_base_path'] = '/home/ftp/pub/mobile'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms'] = {
-    'linux-gnueabi-arm': {},
+    'maemo4': {},
     'linux-i686': {},
     'macosx-i686': {},
     'win32-i686': {},
 }
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['mozconfig'] = 'linux/mobile-browser/nightly'
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['sb_target'] = 'CHINOOK-ARMEL-2007'
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['mozconfig'] = 'linux/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['mozconfig'] = 'macosx/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['mozconfig'] = 'win32/mobile-desktop/nightly'
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['base_name'] = 'Maemo Addonsmgr'
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['mozconfig'] = 'mobile/maemo4/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['sb_target'] = 'CHINOOK-ARMEL-2007'
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['mozconfig'] = 'mobile/linux-i686/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['mozconfig'] = 'mobile/macosx-i686/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['mozconfig'] = 'mobile/win32-i686/mobile-browser/nightly'
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['base_name'] = 'Maemo Addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['base_name'] = 'Linux Fennec Desktop Addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['base_name'] = 'OS X Fennec Desktop Addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['base_name'] = 'Win32 Fennec Desktop Addonsmgr'
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['build_space'] = 5
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['build_space'] = 5
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['build_space'] = 5
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['build_space'] = 5
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['build_space'] = 5
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['builds_before_reboot'] = 5
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['builds_before_reboot'] = 5
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['builds_before_reboot'] = 5
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['builds_before_reboot'] = 5
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['builds_before_reboot'] = 5
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['base_workdir'] = '%s/build/maemo-addonsmgr' % SBOX_HOME
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['base_builddir'] = 'maemo-addonsmgr'
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['base_workdir'] = '%s/build/maemo-addonsmgr' % SBOX_HOME
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['base_builddir'] = 'maemo-addonsmgr'
 # This base directory is for the individual locales repackaging; it is not for the multi-locale build
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['base_l10n_workdir'] = '%s/build/maemo-addonsmgr-l10n' % SBOX_HOME
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['base_l10n_workdir'] = '%s/build/maemo-addonsmgr-l10n' % SBOX_HOME
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['base_builddir'] = 'linux-fennec-addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['base_l10n_workdir'] = 'build/linux-fennec-addonsmgr-l10n'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['base_workdir'] = 'build'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['base_builddir'] = 'macosx-fennec-addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['base_l10n_workdir'] = 'build/macosx-fennec-addonsmgr-l10n'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['base_workdir'] = '.'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['base_builddir'] = 'w32mob-addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['base_l10n_workdir'] = 'w32mob-addonsmgr-l10n'
 MOBILE_BRANCHES['mobile-addonsmgr']['enable_l10n'] = False
 MOBILE_BRANCHES['mobile-addonsmgr']['enable_l10n_onchange'] = False
 MOBILE_BRANCHES['mobile-addonsmgr']['enable_multi_locale'] = False
 MOBILE_BRANCHES['mobile-addonsmgr']['enUS_binaryURL'] = \
     MOBILE_BRANCHES['mobile-addonsmgr']['download_base_url'] + '/nightly/latest-mobile-addonsmgr'
 MOBILE_BRANCHES['mobile-addonsmgr']['tinderbox_tree'] = 'AddonsMgr'
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['slaves'] = MOBILE_SLAVES['linux-gnueabi-arm']
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['slaves'] = MOBILE_SLAVES['maemo4']
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['slaves'] = MOBILE_SLAVES['linux-i686']
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['slaves'] = MOBILE_SLAVES['macosx-i686']
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['slaves'] = MOBILE_SLAVES['win32-i686']
-MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-gnueabi-arm']['env'] = {}
+MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['maemo4']['env'] = {}
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['linux-i686']['env'] = {}
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['macosx-i686']['env'] = {
     'CHOWN_ROOT': '~/bin/chown_root',
     'CHOWN_REVERT': '~/bin/chown_revert',
 }
 MOBILE_BRANCHES['mobile-addonsmgr']['platforms']['win32-i686']['env'] = {}
 
 
@@ -329,32 +330,32 @@ hacktionary = {'mobile-trunk': 'mozilla-
 #  -workdirs
 #  -upload location
 #  -qt builds use qt mozconfigs
 #  -no QT debs, multilocale, or l10n until bug 555351 is fixed
 for toolkit in ['gtk', 'qt']:
     for branch in MOBILE_BRANCHES.keys():
         if 'qt' in toolkit and '1.9.2' in branch:
                 continue
-        maemo5 = deepcopy(MOBILE_BRANCHES[branch]['platforms']['linux-gnueabi-arm'])
+        maemo5 = deepcopy(MOBILE_BRANCHES[branch]['platforms']['maemo4'])
         maemo5['base_name'] = "Maemo 5 %s %s" % (toolkit.upper(),
                                                  hacktionary.get(branch, branch))
         if 'qt' in toolkit:
             maemo5['glob_list'] = ['dist/*.tar.*', 'dist/*.zip']
             maemo5['debs'] = False
             maemo5['enable_multi_locale'] = False
         elif 'l10n_platforms' in MOBILE_BRANCHES[branch]:
             MOBILE_BRANCHES[branch]['l10n_platforms']['maemo5-%s'%toolkit] = 'linux'
             maemo5['enUS_binaryURL'] = '%s-maemo5-%s' % \
               (MOBILE_BRANCHES[branch]['enUS_binaryURL'], toolkit)
         if 'electrolysis' in branch:
-            maemo5['mozconfig'] += "-%s-e10s" % toolkit
+            maemo5['mozconfig'] = re.sub('maemo4/mobile-[^/]*', 'maemo5-%s/mobile-e10s', maemo5['mozconfig'])
             maemo5['mobile_repo_path'] = 'users/pavlov_mozilla.com/mobile-e10s'
         else:
-            maemo5['mozconfig'] += "-%s" % toolkit
+            maemo5['mozconfig'] = maemo5['mozconfig'].replace('maemo4', 'maemo5-%s' % toolkit)
         maemo5['base_workdir'] = '%s/build/%s-maemo5-%s' % (SBOX_HOME,
                                                             branch, toolkit)
         maemo5['base_builddir'] = '%s-maemo5-%s' % (branch, toolkit)
         maemo5['base_upload_dir'] = '%s-maemo5-%s' % (branch, toolkit)
         maemo5['base_l10n_workdir'] = '%s/build/%s-maemo5-%s-l10n' % (SBOX_HOME,
                                                                       toolkit, branch)
         maemo5['sb_target'] = 'FREMANTLE_ARMEL'
         MOBILE_BRANCHES[branch]['platforms']['maemo5-%s'%toolkit] = maemo5
--- a/mozilla2/mobile_master.py
+++ b/mozilla2/mobile_master.py
@@ -33,17 +33,17 @@ from buildbotcustom.l10n import MultiNig
 import config
 reload(config)
 from config import *
 import mobile_config
 reload(mobile_config)
 from mobile_config import MOBILE_BRANCHES, MOBILE_SLAVES
 
 MOBILE_L10N_SLAVES = {
-    'linux-gnueabi-arm': MOBILE_SLAVES['linux-gnueabi-arm'][-8:],
+    'maemo4': MOBILE_SLAVES['maemo4'][-8:],
     'maemo5-gtk': MOBILE_SLAVES['maemo5-gtk'][-8:],
     'maemo5-qt': MOBILE_SLAVES['maemo5-qt'][-8:],
     'linux-i686': MOBILE_SLAVES['linux-i686'][-8:],
     'macosx-i686': MOBILE_SLAVES['macosx-i686'][-8:],
     'win32-i686': MOBILE_SLAVES['win32-i686'][-8:],
 }
 
 m = {}
@@ -181,17 +181,17 @@ for name in sorted(MOBILE_BRANCHES.keys(
 
         nightly_builder = '%s nightly' % pf['base_name']
         triggeredSchedulers=None
         if branch['enable_l10n'] and \
            platform in branch['l10n_platforms'] and \
            nightly_builder in l10nNightlyBuilders:
             triggeredSchedulers=[l10nNightlyBuilders[nightly_builder]['l10n_builder']]
 
-        if platform == 'linux-gnueabi-arm' or 'maemo5' in platform:
+        if platform.startswith('maemo'):
             mobile_dep_factory = MaemoBuildFactory(
                 hgHost=mainConfig['hghost'],
                 repoPath=branch['repo_path'],
                 configRepoPath=mainConfig['config_repo_path'],
                 configSubDir=mainConfig['config_subdir'],
                 mozconfig=pf['mozconfig'],
                 stageUsername=mainConfig['stage_username'],
                 stageGroup=mainConfig['stage_group'],
@@ -377,17 +377,17 @@ for name in sorted(MOBILE_BRANCHES.keys(
             'category': name
         }
         if mobile_dep_builder is not None:
             m['builders'].append(mobile_dep_builder)
         m['builders'].append(mobile_nightly_builder)
 
         if branch['enable_l10n'] and platform in branch['l10n_platforms']:
             mobile_l10n_nightly_factory = None
-            if platform in ('linux-gnueabi-arm', 'maemo5-gtk', 'maemo5-qt'):
+            if platform.startswith('maemo'):
                 nightlyBuildDir = pf['base_builddir'] + '-l10n'
                 depBuildDir = pf['base_builddir'] + '-l10n-dep'
                 mobile_l10n_nightly_factory = MaemoNightlyRepackFactory(
                     nightly = True,
                     hgHost=mainConfig['hghost'],
                     tree=branch['l10n_tree'],
                     project=branch['product_name'],
                     appName=branch['app_name'],
--- a/mozilla2/release-fennec-1.0.py
+++ b/mozilla2/release-fennec-1.0.py
@@ -23,20 +23,20 @@ mergeLocales        = False
 # appVersion and oldAppVersion are optional definitions used in places that
 # don't care about what we call it. Eg, when version bumping we will bump to
 # appVersion, not version.
 version             = '1.0.1rc1'
 appVersion          = '1.0.1'
 milestone           = '1.9.2.1'
 buildNumber         = 1
 baseTag             = 'FENNEC_1_0_1rc1'
-enUSPlatforms       = ('maemo',)
+enUSPlatforms       = ('maemo4',)
 l10nPlatforms       = enUSPlatforms
 enUSDesktopPlatforms = ('linux-i686', 'macosx-i686', 'win32-i686')
 l10nDesktopPlatforms = ()
 talosTestPlatforms  = ()
 ftpServer           = 'ftp.mozilla.org'
 stagingServer       = 'stage.mozilla.org'
 stageBasePath       = '/home/ftp/pub/mobile/candidates'
 base_enUS_binaryURL = 'http://%s/pub/mozilla.org/mobile/candidates/%s-candidates/build%d' % (ftpServer, version, buildNumber)
 doPartnerRepacks    = True
 partnersRepoPath    = 'build/partner-repacks'
-partnerRepackPlatforms = ('maemo',)
+partnerRepackPlatforms = ('maemo4',)
--- a/mozilla2/release-fennec-1.1.py
+++ b/mozilla2/release-fennec-1.1.py
@@ -23,20 +23,20 @@ mergeLocales        = True
 # appVersion and oldAppVersion are optional definitions used in places that
 # don't care about what we call it. Eg, when version bumping we will bump to
 # appVersion, not version.
 version             = '1.1b1'
 appVersion          = '1.1b1'
 milestone           = '1.9.2.5pre'
 buildNumber         = 2
 baseTag             = 'FENNEC_1_1b1'
-enUSPlatforms       = ('maemo',)
+enUSPlatforms       = ('maemo4',)
 l10nPlatforms       = enUSPlatforms
 enUSDesktopPlatforms = ('linux-i686', 'macosx-i686', 'win32-i686')
 l10nDesktopPlatforms = ()
 talosTestPlatforms  = ()
 ftpServer           = 'ftp.mozilla.org'
 stagingServer       = 'stage.mozilla.org'
 stageBasePath       = '/home/ftp/pub/mobile/candidates'
 base_enUS_binaryURL = 'http://%s/pub/mozilla.org/mobile/candidates/%s-candidates/build%d' % (ftpServer, version, buildNumber)
 doPartnerRepacks    = False
 partnersRepoPath    = 'build/partner-repacks'
-partnerRepackPlatforms = ('maemo',)
+partnerRepackPlatforms = ('maemo4',)
--- a/mozilla2/release_mobile_master.py
+++ b/mozilla2/release_mobile_master.py
@@ -60,25 +60,28 @@ schedulers.append(source_scheduler)
 for platform in enUSPlatforms:
     build_scheduler = Dependent(
         name='%s_build' % platform,
         upstream=tag_scheduler,
         builderNames=['%s_build' % platform]
     )
     schedulers.append(build_scheduler)
     if platform in l10nPlatforms:
+        l10nPlatform = platform
+        if l10nPlatform.startswith('maemo'):
+            l10nPlatform = 'maemo'
         repack_scheduler = DependentL10n(
             name='%s_repack' % platform,
-            platform=platform,
+            platform=l10nPlatform,
             upstream=build_scheduler,
             builderNames=['%s_repack' % platform],
             repoType='hg',
             branch=mobileSourceRepoPath,
             baseTag='%s_RELEASE' % baseTag,
-            locales=platform_locales[platform],
+            locales=platform_locales[l10nPlatform],
             tree='release'
         )
         schedulers.append(repack_scheduler)
 for platform in enUSDesktopPlatforms:
     build_scheduler = Dependent(
         name='mobile_%s_desktop_build' % platform,
         upstream=tag_scheduler,
         builderNames=['mobile_%s_desktop_build' % platform]
@@ -182,20 +185,20 @@ builders.append({
 
 
 for platform in enUSPlatforms:
     baseUploadDir='%s-candidates/build%d' % (version, buildNumber)
     candidatesPath = '%s/%s' % (stageBasePath, baseUploadDir)
     build_factory = None
     repack_factory = None
 
-    if platform == 'maemo':
-        pf = mobileBranchConfig['platforms']['linux-gnueabi-arm']
+    if platform.startswith('maemo'):
+        pf = mobileBranchConfig['platforms'][platform]
         clobberTime = pf.get('clobber_time', branchConfig['default_clobber_time'])
-        mozconfig = 'linux/%s/release' % mobileSourceRepoName
+        mozconfig = 'mobile/%s/%s/release' % (platform, mobileSourceRepoName)
         releaseWorkDir  = pf['base_workdir'] + '-release'
         releaseBuildDir = pf['base_builddir'] + '-release'
         build_factory = MaemoReleaseBuildFactory(
             env=pf['env'],
             hgHost=branchConfig['hghost'],
             repoPath=mozSourceRepoPath,
             configRepoPath=branchConfig['config_repo_path'],
             configSubDir=branchConfig['config_subdir'],
@@ -203,17 +206,17 @@ for platform in enUSPlatforms:
             stageUsername=branchConfig['stage_username'],
             stageServer=branchConfig['stage_server'],
             stageSshKey=branchConfig['stage_ssh_key'],
             stageBasePath=candidatesPath,
             mobileRepoPath=mobileSourceRepoPath,
             mozRevision='%s_RELEASE' % baseTag,
             mobileRevision='%s_RELEASE' % baseTag,
             l10nTag='%s_RELEASE' % baseTag,
-            platform='linux-gnueabi-arm',
+            platform=platform,
             buildsBeforeReboot=pf['builds_before_reboot'],
             baseWorkDir=releaseWorkDir,
             baseBuildDir=releaseBuildDir,
             baseUploadDir=baseUploadDir,
             buildToolsRepoPath=branchConfig['build_tools_repo_path'],
             clobberURL=branchConfig['base_clobber_url'],
             clobberTime=clobberTime,
             buildSpace=10,
@@ -228,26 +231,27 @@ for platform in enUSPlatforms:
         'name': '%s_build' % platform,
         'slavenames': pf['slaves'],
         'category': 'release',
         'builddir': '%s_build' % platform,
         'factory': build_factory
     })
 
     if platform in l10nPlatforms:
-        if platform == 'maemo':
+        if platform.startswith('maemo'):
             releaseBuildDir = pf['base_builddir'] + '-l10n-release'
             repack_factory = MaemoReleaseRepackFactory(
-                enUSBinaryURL='%s/maemo' % (base_enUS_binaryURL),
+                enUSBinaryURL='%s/%s' % (base_enUS_binaryURL, platform),
                 stageServer=branchConfig['stage_server'],
                 stageUsername=branchConfig['stage_username'],
                 stageSshKey=branchConfig['stage_ssh_key'],
-                stageBasePath='%s/%s-candidates/build%d/maemo' % (stageBasePath,
-                                                                  version,
-                                                                  buildNumber),
+                stageBasePath='%s/%s-candidates/build%d/%s' % (stageBasePath,
+                                                               version,
+                                                               buildNumber,
+                                                               platform),
                 baseWorkDir='%s-release' % pf['base_l10n_workdir'],
                 baseBuildDir=releaseBuildDir,
                 l10nTag='%s_RELEASE' % baseTag,
                 hgHost=branchConfig['hghost'],
                 repoPath=mozSourceRepoPath,
                 l10nRepoPath=l10nRepoPath,
                 mobileRepoPath=mobileSourceRepoPath,
                 packageGlobList=['-r', '%(locale)s'],
@@ -260,17 +264,17 @@ for platform in enUSPlatforms:
                 configSubDir=branchConfig['config_subdir'],
                 mozconfig=mozconfig,
                 platform=platform,
                 tree='release'
             )
 
         builders.append({
             'name': '%s_repack' % platform,
-            'slavenames': MOBILE_L10N_SLAVES['linux-gnueabi-arm'],
+            'slavenames': MOBILE_L10N_SLAVES['maemo4'],
             'category': 'release',
             'builddir': '%s_repack' % platform,
             'factory': repack_factory
         })
 
 for platform in enUSDesktopPlatforms:
     baseUploadDir='%s-candidates/build%d' % (version, buildNumber)
     candidatesPath = '%s/%s' % (stageBasePath, baseUploadDir)
@@ -288,17 +292,17 @@ for platform in enUSDesktopPlatforms:
     elif platform == 'win32-i686':
         packageGlobList = ['-r', 'dist/*.zip']
     
     build_factory = ReleaseMobileDesktopBuildFactory(
         hgHost=branchConfig['hghost'],
         repoPath=mozSourceRepoPath,
         configRepoPath=branchConfig['config_repo_path'],
         configSubDir=branchConfig['config_subdir'],
-        mozconfig=pf['mozconfig'],
+        mozconfig=pf['mozconfig'].replace('nightly', 'release'),
         env=pf['env'],
         stageUsername=branchConfig['stage_username'],
         stageGroup=branchConfig['stage_group'],
         stageSshKey=branchConfig['stage_ssh_key'],
         stageServer=branchConfig['stage_server'],
         stageBasePath='%s/%s' % (candidatesPath, platform),
         mobileRepoPath=mobileSourceRepoPath,
         mozRevision='%s_RELEASE' % baseTag,
@@ -336,17 +340,17 @@ if doPartnerRepacks:
         version=version,
         buildNumber=buildNumber,
         partnersRepoPath=partnersRepoPath,
         stagingServer=stagingServer,
         stageUsername=branchConfig['stage_username'],
         stageSshKey=branchConfig['stage_ssh_key'],
         nightlyDir='candidates',
         platformList=partnerRepackPlatforms,
-        baseWorkDir='%s-partner' % mobileBranchConfig['platforms']['linux-gnueabi-arm']['base_workdir'],
+        baseWorkDir='%s-partner' % mobileBranchConfig['platforms']['maemo4']['base_workdir'],
         python='python2.5',
         packageDmg=False,
         createRemoteStageDir=True
     )
     builders.append({
         'name': 'mobile_partner_repack',
         'slavenames': branchConfig['platforms']['linux']['slaves'],
         'category': 'release',
deleted file mode 100644
--- a/mozilla2/win32/mobile-desktop/nightly/mozconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-# Options for client.mk.
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/objdir
-mk_add_options MOZ_PKG_FORMAT=ZIP
-
-export WIN32_REDIST_DIR=/d/msvs8/VC/redist/x86/Microsoft.VC80.CRT
-
-# Global options
-ac_add_options --disable-debug
-ac_add_options --enable-optimize
-ac_add_options --enable-tests
-ac_add_options --enable-jemalloc
-
-ac_add_options --disable-javaxpcom
-ac_add_options --enable-application=mobile