From 03496f658f2e6fc5fa2d3ab5926ed3438e44332d Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@cardoe.com>
Date: Wed, 9 Nov 2016 22:10:32 -0600
Subject: [PATCH] cargo: use install targets to avoid rust-installer

This install target is used by Gentoo to avoid needing rust-installer.
---
 recipes-devtools/cargo/cargo.inc       | 2 +-
 recipes-devtools/cargo/cargo_0.11.0.bb | 3 ---
 recipes-devtools/cargo/cargo_0.13.0.bb | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/recipes-devtools/cargo/cargo.inc b/recipes-devtools/cargo/cargo.inc
index 7347766..e9462d8 100644
--- a/recipes-devtools/cargo/cargo.inc
+++ b/recipes-devtools/cargo/cargo.inc
@@ -54,7 +54,7 @@ do_compile () {
 }
 
 do_install () {
-	oe_runmake DESTDIR="${D}" install
+	oe_runmake prepare-image-${TARGET_SYS} IMGDIR_${TARGET_SYS}="${D}${prefix}"
 }
 
 BBCLASSEXTEND = "native"
diff --git a/recipes-devtools/cargo/cargo_0.11.0.bb b/recipes-devtools/cargo/cargo_0.11.0.bb
index 08e0de3..df198d8 100644
--- a/recipes-devtools/cargo/cargo_0.11.0.bb
+++ b/recipes-devtools/cargo/cargo_0.11.0.bb
@@ -5,7 +5,6 @@ SRC_URI += " \
 	git://github.com/rust-lang/cargo.git;protocol=https;name=cargo \
 	file://0001-disable-cargo-snapshot-fetch.patch \
 	file://0001-Never-update-the-registry-index.patch \
-	git://github.com/rust-lang/rust-installer.git;protocol=https;name=rust-installer;destsuffix=${S}/src/rust-installer \
 	crate://crates.io/advapi32-sys/0.1.2 \
 	crate://crates.io/bufstream/0.1.1 \
 	crate://crates.io/crossbeam/0.2.8 \
@@ -60,8 +59,6 @@ SRC_URI += " \
 # https://static.rust-lang.org/dist/channel-rust-1.10.0.toml
 SRCREV_cargo = "259324cd8f9bb6e1068a3a2b77685e90fda3e3b6"
 
-SRCREV_rust-installer = "c37d3747da75c280237dc2d6b925078e69555499"
-
 S = "${WORKDIR}/git"
 
 LIC_FILES_CHKSUM ="\
diff --git a/recipes-devtools/cargo/cargo_0.13.0.bb b/recipes-devtools/cargo/cargo_0.13.0.bb
index e7d0984..eb6c1ae 100644
--- a/recipes-devtools/cargo/cargo_0.13.0.bb
+++ b/recipes-devtools/cargo/cargo_0.13.0.bb
@@ -3,7 +3,6 @@ require cargo.inc
 
 SRC_URI += " \
 	git://github.com/rust-lang/cargo.git;protocol=https;name=cargo \
-	git://github.com/rust-lang/rust-installer.git;protocol=https;name=rust-installer;destsuffix=${S}/src/rust-installer \
 	crate://crates.io/advapi32-sys/0.2.0 \
 	crate://crates.io/aho-corasick/0.5.2 \
 	crate://crates.io/bitflags/0.1.1 \
@@ -78,8 +77,6 @@ SRC_URI += " \
 # https://static.rust-lang.org/dist/channel-rust-1.12.1.toml
 SRCREV_cargo = "109cb7c33d426044d141457049bd0fffaca1327c"
 
-SRCREV_rust-installer = "c37d3747da75c280237dc2d6b925078e69555499"
-
 S = "${WORKDIR}/git"
 
 LIC_FILES_CHKSUM ="\