moblin-floating-revisions: Use mx branch for moblin-web-browser

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
index 8e63005a8c660e7901d00f87a0744fac1ca075c9..9c0c87362f490021027f3ab68c66c1e4bbb9bf7a 100644 (file)
--- a/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-floating-revisions.inc
@@ -93,3 +93,5 @@ PREFERRED_VERSION_libx11-trim ?= "1.2.1+git%"
 
 PREFERRED_VERSION_libxcb ?= "1.3"
 PREFERRED_VERSION_xcb-proto ?= "1.5"
+
+MOBLINBROWSERBRANCH = "mx"

diff --git a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
index b03e9e18d92fe3ad3da0d4bd9cc0f26a3bbc6a35..befc28a2a08c1af1c671b1ff7d980bf8802b5564 100644 (file)
--- a/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
+++ b/meta-moblin/packages/moblin-web-browser/moblin-web-browser_git.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Moblin web browser (based on clutter + mozilla-headless/mozilla-offscreen)"
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
+SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git;branch=${MOBLINBROWSERBRANCH} \
            file://xpidl-a3ea71159bef93dc03762195bd5404a51db5e4a6.patch;patch=1;rev=a3ea71159bef93dc03762195bd5404a51db5e4a6;notrev=78ddd155cc297811720e4c4835d468ac6c4d9666 \
            file://xpidl-78ddd155cc297811720e4c4835d468ac6c4d9666.patch;patch=1;rev=78ddd155cc297811720e4c4835d468ac6c4d9666;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6 \
            file://xpidl.patch;patch=1;notrev=a3ea71159bef93dc03762195bd5404a51db5e4a6;notrev=78ddd155cc297811720e4c4835d468ac6c4d9666"
@@ -11,6 +11,8 @@ DEPENDS = "clutter-1.0 clutter-mozembed clutter-gtk-0.10 libunique mozilla-headl
 
 S = "${WORKDIR}/git"
 
+MOBLINBROWSERBRANCH ?= "master"
+
 EXTRA_OECONF = "--with-idl-prefix=${STAGING_DIR_TARGET}/"
 
 FILES_${PN} += "${datadir}/moblin-web-browser/chrome/* ${libdir}/xulrunner-*/chrome/* ${datadir}/dbus-1/services/*"