From 2d84e747488f06b171d5791b58596ae7089ef81a Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Mon, 29 Dec 2014 11:06:59 -0500
Subject: [PATCH 1/5] cargo: update

---
 recipes/cargo/cargo_git.bb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/recipes/cargo/cargo_git.bb b/recipes/cargo/cargo_git.bb
index 50d67f3..656067a 100644
--- a/recipes/cargo/cargo_git.bb
+++ b/recipes/cargo/cargo_git.bb
@@ -1,9 +1,7 @@
-SRCREV_cargo = "0f6667ca0631fe72d1e15759c845f0197e3dfe19"
+SRCREV_cargo = "b46015585bba8f4489f473e23df8ea4b8c66c8c0"
 require cargo.inc
 
 SRC_URI += " \
-	file://0001-custom_build-build-output-goes-in-the-directory-for-.patch \
-\
 	git://github.com/carllerche/curl-rust.git;protocol=https;name=curl-rust;destsuffix=curl-rust \
 	file://curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch;patchdir=../curl-rust \
 	file://curl-rust/0002-openssl-sys-is-used-in-curl-rust-so-include-it-expli.patch;patchdir=../curl-rust \
@@ -12,8 +10,8 @@ SRC_URI += " \
 	file://ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch;patchdir=../ssh2-rs \
 "
 
-SRCREV_curl-rust = "6f007b4967ec12e36937dcb081abe0bdb3bcc508"
-SRCREV_ssh2-rs = "982dc47a45a5a2d66ea092ee6bb9503ddcbf36d9"
+SRCREV_curl-rust = "4517ee606c65bbe03e4ad4f661725eb80e667a69"
+SRCREV_ssh2-rs = "509a8459e466ffa4705a0c686b80ac80b499f5d5"
 SRCREV_FORMAT = "cargo_curl-rust_ssh2-rs"
 EXTRA_OECARGO_PATHS = "\
 	${WORKDIR}/curl-rust \

From e532a5ba3df0b38d957497ceaf17638e59cf8a05 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Mon, 29 Dec 2014 13:27:00 -0500
Subject: [PATCH 2/5] rust: manually chmod to prep for lack of install.sh
 support for bindir

---
 recipes/rust/rust.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/recipes/rust/rust.inc b/recipes/rust/rust.inc
index a7adafa..d8eac74 100644
--- a/recipes/rust/rust.inc
+++ b/recipes/rust/rust.inc
@@ -334,6 +334,11 @@ do_compile () {
 rust_do_install () {
 	rust_runmake DESTDIR="${D}" install
 
+        # Rust's install.sh doesn't mark executables as executable because
+        # we're using a custom bindir, do it ourselves.
+        chmod +x "${D}/${bindir}/*"
+
+        # Install our custon target.json files
 	local td="${D}${libdir}/rust/targets/"
 	install -d "$td"
 	for tgt in "${WORKDIR}/targets/"* ; do

From 3e1ddbf0ae729fc664c0f5a71515abbf368fce12 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Mon, 29 Dec 2014 13:50:50 -0500
Subject: [PATCH 3/5] Revert "cargo: update"

This reverts commit 2d84e747488f06b171d5791b58596ae7089ef81a.
---
 recipes/cargo/cargo_git.bb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/recipes/cargo/cargo_git.bb b/recipes/cargo/cargo_git.bb
index 656067a..50d67f3 100644
--- a/recipes/cargo/cargo_git.bb
+++ b/recipes/cargo/cargo_git.bb
@@ -1,7 +1,9 @@
-SRCREV_cargo = "b46015585bba8f4489f473e23df8ea4b8c66c8c0"
+SRCREV_cargo = "0f6667ca0631fe72d1e15759c845f0197e3dfe19"
 require cargo.inc
 
 SRC_URI += " \
+	file://0001-custom_build-build-output-goes-in-the-directory-for-.patch \
+\
 	git://github.com/carllerche/curl-rust.git;protocol=https;name=curl-rust;destsuffix=curl-rust \
 	file://curl-rust/0001-curl-sys-avoid-explicitly-linking-in-openssl.-If-it-.patch;patchdir=../curl-rust \
 	file://curl-rust/0002-openssl-sys-is-used-in-curl-rust-so-include-it-expli.patch;patchdir=../curl-rust \
@@ -10,8 +12,8 @@ SRC_URI += " \
 	file://ssh2-rs/0001-Unconditionally-depend-on-openssl-sys.patch;patchdir=../ssh2-rs \
 "
 
-SRCREV_curl-rust = "4517ee606c65bbe03e4ad4f661725eb80e667a69"
-SRCREV_ssh2-rs = "509a8459e466ffa4705a0c686b80ac80b499f5d5"
+SRCREV_curl-rust = "6f007b4967ec12e36937dcb081abe0bdb3bcc508"
+SRCREV_ssh2-rs = "982dc47a45a5a2d66ea092ee6bb9503ddcbf36d9"
 SRCREV_FORMAT = "cargo_curl-rust_ssh2-rs"
 EXTRA_OECARGO_PATHS = "\
 	${WORKDIR}/curl-rust \

From 8507c6b7ac0dc89b2d5b266a339cedce1522fbe6 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Mon, 29 Dec 2014 14:45:44 -0500
Subject: [PATCH 4/5] rust: fixup chmod

---
 recipes/rust/rust.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/rust/rust.inc b/recipes/rust/rust.inc
index d8eac74..5711392 100644
--- a/recipes/rust/rust.inc
+++ b/recipes/rust/rust.inc
@@ -336,7 +336,7 @@ rust_do_install () {
 
         # Rust's install.sh doesn't mark executables as executable because
         # we're using a custom bindir, do it ourselves.
-        chmod +x "${D}/${bindir}/*"
+        chmod +x "${D}/${bindir}/"*
 
         # Install our custon target.json files
 	local td="${D}${libdir}/rust/targets/"

From 8735704324f58eab330c9defbe98d49902f198e8 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Mon, 29 Dec 2014 14:55:12 -0500
Subject: [PATCH 5/5] rust: fixup chmod +x

---
 recipes/rust/rust.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes/rust/rust.inc b/recipes/rust/rust.inc
index 5711392..50b8254 100644
--- a/recipes/rust/rust.inc
+++ b/recipes/rust/rust.inc
@@ -336,7 +336,9 @@ rust_do_install () {
 
         # Rust's install.sh doesn't mark executables as executable because
         # we're using a custom bindir, do it ourselves.
-        chmod +x "${D}/${bindir}/"*
+        chmod +x "${D}/${bindir}/rustc"
+        chmod +x "${D}/${bindir}/rustdoc"
+        chmod +x "${D}/${bindir}/rust-lldb"
 
         # Install our custon target.json files
 	local td="${D}${libdir}/rust/targets/"