cargo: use new snapshot to avoid issue with version parsing

cargo issue: https://github.com/rust-lang/cargo/pull/2352

At the same time, fix our snapshot support & add a patch to disable
auto-download of snapshots to ensure we don't accidentally break it
again in the future.

recipes/cargo/cargo-snapshot-2015-04-02.inc

@@ -1,4 +0,0 @@
-
-CARGO_SNAPSHOT = "2015-04-02/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
-SRC_URI[md5sum] = "3d62194d02a9088cd8aae379e9498134"
-SRC_URI[sha256sum] = "16b6338ba2942989693984ba4dbd057c2801e8805e6da8fa7b781b00e722d117"

recipes/cargo/cargo-snapshot.inc

@@ -0,0 +1,4 @@
+
+CARGO_SNAPSHOT = "2016-01-31/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz"
+SRC_URI[md5sum] = "52f48780b7cfadc88813766048d4d402"
+SRC_URI[sha256sum] = "1920e661bab536eba763ff6704a1d62fb20bb0f67d8c5a119e41c49510ea5fa6"

recipes/cargo/cargo.inc

@@ -54,7 +54,7 @@ do_compile () {
 
 	rm -rf target/snapshot
 	mkdir -p target
-	cp -R ${WORKDIR}/$(basename ${CARGO_SNAPSHOT} .tar.gz) target/snapshot
+	cp -R ${WORKDIR}/$(basename ${CARGO_SNAPSHOT} .tar.gz)/cargo target/snapshot
 
 	oe_runmake ARGS="--verbose"
 }

recipes/cargo/cargo_0.7.0.bb

@@ -1,8 +1,9 @@
-require cargo-snapshot-2015-04-02.inc
+require cargo-snapshot.inc
 require cargo.inc
 
 SRC_URI += " \
 	https://github.com/rust-lang/cargo/archive/${PV}.tar.gz;name=cargo \
+	file://0001-disable-cargo-snapshot-fetch.patch \
 	git://github.com/rust-lang/rust-installer.git;protocol=https;name=rust-installer;destsuffix=${BP}/src/rust-installer \
 "
 SRC_URI[cargo.md5sum] = "2089790a4a48de7f8f3cb1afcfa9ec74"

recipes/cargo/files/0001-disable-cargo-snapshot-fetch.patch

@@ -0,0 +1,27 @@
+From 9652ddba460f30e83f401ab1564656e7787bdea9 Mon Sep 17 00:00:00 2001
+From: Cody P Schafer <dev@codyps.com>
+Date: Wed, 3 Feb 2016 15:59:48 -0500
+Subject: [PATCH] disable cargo snapshot fetch
+
+---
+ Makefile.in | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 286a593..9c66486 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -92,10 +92,6 @@ test-unit-$(1): $$(CARGO)
+ endef
+ $(foreach target,$(CFG_TARGET),$(eval $(call CARGO_TARGET,$(target))))
+ 
+-$(TARGET_ROOT)/snapshot/bin/cargo$(X): src/snapshots.txt
+-	$(CFG_PYTHON) src/etc/dl-snapshot.py $(CFG_BUILD)
+-	touch $@
+-
+ 
+ # === Tests
+ 
+-- 
+2.7.0
+