From ea4560f65862a7c94d15cfe6006f8059ab62ea74 Mon Sep 17 00:00:00 2001
From: Mustapha Lansana <Mustapha.Lansana@windriver.com>
Date: Fri, 19 Sep 2014 19:03:32 -0400
Subject: chef: resolve mismatch between branch name and SRCREV

Maintainer's of the upstream git trees for these packages have branched
the repos from which these packages were fetched.
This creates a mismatch between the SRCREV and branch name in the recipe
files.
Specify the branch name to resolve the error or update
the SRCREV to match a commit id found on master.

Signed-off-by: Mustapha Lansana <Mustapha.Lansana@windriver.com>
---
 meta-openstack/recipes-devtools/ruby/bundler_git.bb    | 2 +-
 meta-openstack/recipes-devtools/ruby/chef-zero_git.bb  | 2 +-
 meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb   | 3 ++-
 meta-openstack/recipes-devtools/ruby/mime-types_git.bb | 2 +-
 meta-openstack/recipes-devtools/ruby/ohai_git.bb       | 2 +-
 meta-openstack/recipes-devtools/ruby/pry_git.bb        | 2 +-
 meta-openstack/recipes-support/chef/chef_git.bb        | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/meta-openstack/recipes-devtools/ruby/bundler_git.bb b/meta-openstack/recipes-devtools/ruby/bundler_git.bb
index ca69f89..f7617a0 100644
--- a/meta-openstack/recipes-devtools/ruby/bundler_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/bundler_git.bb
@@ -25,7 +25,7 @@ SRCREV = "06e3647c117da210ffd15a174624497830addd7b"
 S = "${WORKDIR}/git"
 
 SRC_URI = " \
-    git://github.com/bundler/bundler.git \
+    git://github.com/bundler/bundler.git;branch=1-7-stable \
     "
 
 inherit ruby
diff --git a/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb b/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb
index 1d8a240..2f43fb1 100644
--- a/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb
@@ -23,7 +23,7 @@ SRCREV = "1c87a463637b3d0c58755e2362cc8ef35b6da1fd"
 S = "${WORKDIR}/git"
 
 SRC_URI = " \
-    git://github.com/opscode/chef-zero.git \
+    git://github.com/opscode/chef-zero.git;branch=master \
     "
 
 inherit ruby
diff --git a/meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb b/meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb
index fc7956d..8566fb3 100644
--- a/meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/diff-lcs_git.bb
@@ -14,7 +14,8 @@ PR = "r0"
 
 BPV = "1.2.5"
 PV = "${BPV}"
-SRCREV = "d53e92242b9dd6745e56a0ff4ba15d2f62052b91"
+#SRCREV = "d53e92242b9dd6745e56a0ff4ba15d2f62052b91"
+SRCREV = "704bc2c0000b5f9bf49d607dcd0d3989b63b2595"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-openstack/recipes-devtools/ruby/mime-types_git.bb b/meta-openstack/recipes-devtools/ruby/mime-types_git.bb
index a24c1bb..d078b52 100644
--- a/meta-openstack/recipes-devtools/ruby/mime-types_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/mime-types_git.bb
@@ -19,7 +19,7 @@ SRCREV = "6be836f59a041893cfc1c25668b3aa3552a7e334"
 S = "${WORKDIR}/git"
 
 SRC_URI = " \
-    git://github.com/halostatue/mime-types.git \
+    git://github.com/halostatue/mime-types.git;branch=v1-bug-fixes \
     "
 
 inherit ruby
diff --git a/meta-openstack/recipes-devtools/ruby/ohai_git.bb b/meta-openstack/recipes-devtools/ruby/ohai_git.bb
index 6bd31e1..9d89357 100644
--- a/meta-openstack/recipes-devtools/ruby/ohai_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/ohai_git.bb
@@ -20,7 +20,7 @@ SRCREV = "b306186701201bfc78b7bcc8908ee3524434cc93"
 S = "${WORKDIR}/git"
 
 SRC_URI = " \
-    git://github.com/opscode/ohai.git \
+    git://github.com/opscode/ohai.git;branch=7-stable \
     "
 
 inherit ruby
diff --git a/meta-openstack/recipes-devtools/ruby/pry_git.bb b/meta-openstack/recipes-devtools/ruby/pry_git.bb
index 2dc6234..37d4497 100644
--- a/meta-openstack/recipes-devtools/ruby/pry_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/pry_git.bb
@@ -18,7 +18,7 @@ SRCREV = "047788c4225b25bb0462e06715616964e4f0da15"
 S = "${WORKDIR}/git"
 
 SRC_URI = " \
-    git://github.com/pry/pry.git \
+    git://github.com/pry/pry.git;branch=0-9-12-stable \
     file://rdoc-fixup-opt.banner-heredoc.patch \
     "
 
diff --git a/meta-openstack/recipes-support/chef/chef_git.bb b/meta-openstack/recipes-support/chef/chef_git.bb
index 11c651d..c8a422b 100644
--- a/meta-openstack/recipes-support/chef/chef_git.bb
+++ b/meta-openstack/recipes-support/chef/chef_git.bb
@@ -21,7 +21,7 @@ SRCREV = "410af3e88cf9f0793c56363563be8fa173244d3a"
 S = "${WORKDIR}/git"
 
 SRC_URI = " \
-    git://github.com/opscode/chef.git \
+    git://github.com/opscode/chef.git;branch=11-stable \
     "
 
 inherit ruby
-- 
cgit v1.2.3-54-g00ecf