From a2ef8b117c882290a6f406c5aa86aec6d55dfed7 Mon Sep 17 00:00:00 2001
From: Cody P Schafer <dev@codyps.com>
Date: Mon, 29 Jun 2015 10:33:17 -0400
Subject: [PATCH] fixup! rust

---
 recipes/rust/rust-release.inc | 1 +
 recipes/rust/rust_1.1.0.bb    | 2 +-
 recipes/rust/rust_git.bb      | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes/rust/rust-release.inc b/recipes/rust/rust-release.inc
index f2a69d0..fd8e3da 100644
--- a/recipes/rust/rust-release.inc
+++ b/recipes/rust/rust-release.inc
@@ -2,5 +2,6 @@ SRC_URI = "\
 	https://static.rust-lang.org/dist/rustc-${PV}-src.tar.gz;name=rust \
 "
 
+S = "${WORKDIR}/rustc-${PV}"
 require rust.inc
 
diff --git a/recipes/rust/rust_1.1.0.bb b/recipes/rust/rust_1.1.0.bb
index b368ec0..7ada207 100644
--- a/recipes/rust/rust_1.1.0.bb
+++ b/recipes/rust/rust_1.1.0.bb
@@ -16,7 +16,7 @@ SRC_URI[rust-snapshot.md5sum] = "e0d49475a787aaa9481ec0b1a28d1f7a"
 SRC_URI[rust-snapshot.sha256sum] = "e7858a90c2c6c35299ebe2cb6425f3f84d0ba171dcbce20ff68295a1ff75c7e5"
 
 # "patch-prefix"
-PP = "${BPN}-${PV}"
+PP = "rust-${PV}"
 SRC_URI_append = "\
 	file://${PP}/0001-platform.mk-avoid-choking-on-i586.patch \
 	file://${PP}/0002-Target-add-default-target.json-path-libdir-rust-targ.patch \
diff --git a/recipes/rust/rust_git.bb b/recipes/rust/rust_git.bb
index 3c7fe3e..c636af2 100644
--- a/recipes/rust/rust_git.bb
+++ b/recipes/rust/rust_git.bb
@@ -8,11 +8,11 @@ RS_SRCHASH = "ba0e1cd"
 RS_HASH = "5fd8698fdfe953e6c4d86cf4fa1d5f3a0053248c"
 RUST_SNAPSHOT = "rust-stage0-${RS_DATE}-${RS_SRCHASH}-linux-x86_64-${RS_HASH}.tar.bz2"
 
-SRC_URI[md5sum] += "e0d49475a787aaa9481ec0b1a28d1f7a"
-SRC_URI[sha256sum] += "e7858a90c2c6c35299ebe2cb6425f3f84d0ba171dcbce20ff68295a1ff75c7e5"
+SRC_URI[rust-snapshot.md5sum] = "e0d49475a787aaa9481ec0b1a28d1f7a"
+SRC_URI[rust-snapshot.sha256sum] = "e7858a90c2c6c35299ebe2cb6425f3f84d0ba171dcbce20ff68295a1ff75c7e5"
 
 # "patch-prefix"
-PP = "${BPN}-git"
+PP = "rust-git"
 SRC_URI_append = "\
 	file://${PP}/0001-platform.mk-avoid-choking-on-i586.patch \
 	file://${PP}/0002-Target-add-default-target.json-path-libdir-rust-targ.patch \