From: Patrick Ohly <patrick.ohly@intel.com>
Date: Fri, 9 Jan 2015 09:54:07 +0000 (-0800)
Subject: tizen-distro: switch to tracking Yocto 1.7 ("Dizzy")
X-Git-Tag: rev_ivi_2015_02_04~824
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1a38de751203266ce413ed736a71999be66d0d54;p=scm%2Fbb%2Ftizen-distro.git

tizen-distro: switch to tracking Yocto 1.7 ("Dizzy")

For now, Tizen uses Yocto 1.7 as base. Therefore switch to importing the
component branches for 1.7.

This works seamlessly because the current state of the tizen-distro repo
matches the branch points of each of these branches.
---

diff --git a/conf/combo-layer.conf b/conf/combo-layer.conf
index dbcf27b..18bbb78 100644
--- a/conf/combo-layer.conf
+++ b/conf/combo-layer.conf
@@ -2,21 +2,21 @@
 src_uri = git://git.openembedded.org/bitbake
 dest_dir = bitbake
 hook = conf/combo-layerhook-bitbake.sh
-branch = master
+branch = 1.24
 last_revision = 2ac33aac3446cb12227f1b8daa5f27f417c9bb9e
 
 [openembedded-core]
 src_uri = git://git.openembedded.org/openembedded-core
 dest_dir = .
 hook = conf/combo-layerhook-openembedded-core.sh
-branch = master
+branch = dizzy
 last_revision = 97756472d3a69eaca95d105494ffea78c6b077e0
 
 [meta-openembedded]
 src_uri = git://git.openembedded.org/meta-openembedded
 dest_dir = meta-openembedded
 hook = conf/combo-layerhook-meta-openembedded.sh
-branch = master
+branch = dizzy
 last_revision = d2f6561a2497babda234dae012709cb661fe38bd
 
 [meta-qt5]