rust-installer is naughty

classes/rust-installer.bbclass

@@ -0,0 +1,15 @@
+# Rust installer isn't very nice and drops a bunch of junk in our filesystem,
+# clean it up after the install.
+
+rust_installer_do_install () {
+	rm ${D}/${libdir}/rustlib/install.log
+	rm ${D}/${libdir}/rustlib/rust-installer-version
+	rm ${D}/${libdir}/rustlib/uninstall.sh
+	rm ${D}/${libdir}/rustlib/components
+}
+
+do_install_append () {
+	rust_installer_do_install
+}
+
+EXPORT_FUNCTIONS rust_installer_do_install

recipes/cargo/cargo.inc

@@ -2,6 +2,7 @@ INHIBIT_CARGO_DEP = "1"
 
 inherit cargo
 inherit patch
+inherit rust-installer
 
 SUMMARY = "Cargo downloads your Rust project's dependencies and builds your project"
 HOMEPAGE = "http://crates.io"
@@ -10,14 +11,17 @@ LICENSE = "MIT | Apache-2.0"
 
 DEPENDS = "openssl zlib libgit2 curl ca-certificates libssh2"
 
-SRC_URI = "git://github.com/rust-lang/cargo.git;protocol=https;name=cargo"
+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=git/src/rust-installer \
+"
 
 LIC_FILES_CHKSUM ="\
 	file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
 	file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
 	file://LICENSE-THIRD-PARTY;md5=afbb7ae0aa70c8e437a007314eae5f3b \
 "
-SRCREV_FORMAT ?= "cargo"
+SRCREV_FORMAT = "cargo_rust-installer"
 PV .= "+git${SRCPV}"
 
 S = "${WORKDIR}/git"

recipes/cargo/cargo_git.bb

@@ -1,5 +1,6 @@
 # 2015-3-01
 SRCREV_cargo = "efa4bd0897c4adb46169f2b2359613d394e55759"
+SRCREV_rust-installer = "60fd8abfcae50629a3fc664bd809238fed039617"
 
 require cargo.inc
 
@@ -28,7 +29,7 @@ SRCREV_ssh2-rs = "bb0c71792799d7261ae6356a26aabd39c9e78430"
 # 0.2.2 / -sys 0.2.1
 SRCREV_git2-rs = "8b52e3c86cec585038513116654d308f101e4582"
 
-SRCREV_FORMAT = "cargo_curl-rust_curl_ssh2-rs_git2-rs"
+SRCREV_FORMAT .= "_curl-rust_curl_ssh2-rs_git2-rs"
 EXTRA_OECARGO_PATHS = "\
 	${WORKDIR}/curl-rust \
 	${WORKDIR}/ssh2-rs \

recipes/rust/rust.inc

@@ -1,4 +1,5 @@
 inherit rust
+inherit rust-installer
 
 SUMMARY = "Rust compiler and runtime libaries"
 HOMEPAGE = "http://www.rust-lang.org"