cargo: convert to versioned include file

We'll need the prior version of cargo to boot strap ourselves going
forward so include the version info so we can support multiple versions
in the tree.

(cherry picked from commit 1ff41650d5)

recipes-devtools/cargo/cargo-0.16.0.inc

@@ -0,0 +1,5 @@
+
+CARGO_SNAPSHOT = "2016-09-01/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz;downloadfilename=cargo-nightly-x86_64-unknown-linux-gnu-2016-09-01.tar.gz"
+SRC_URI[cargo-snapshot.md5sum] = "d41ebf79290a7c9c9e5df87cb27e5091"
+SRC_URI[cargo-snapshot.sha256sum] = "365e5cad79512d244b8ced32f8e5b86a710fc6c17f0d0f5f744b8058ef6dc756"
+

recipes-devtools/cargo/cargo-snapshot.inc

@@ -1,4 +0,0 @@
-
-CARGO_SNAPSHOT = "2016-09-01/cargo-nightly-x86_64-unknown-linux-gnu.tar.gz;downloadfilename=cargo-nightly-x86_64-unknown-linux-gnu-2016-09-01.tar.gz"
-SRC_URI[md5sum] = "d41ebf79290a7c9c9e5df87cb27e5091"
-SRC_URI[sha256sum] = "365e5cad79512d244b8ced32f8e5b86a710fc6c17f0d0f5f744b8058ef6dc756"

recipes-devtools/cargo/cargo.inc

@@ -1,15 +1,12 @@
-require cargo-snapshot.inc
-
 SECTION = "devel"
 
 DEPENDS = "openssl zlib libgit2 curl ca-certificates libssh2"
 
 SRC_URI += "\
-	http://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${CARGO_SNAPSHOT} \
+	https://static.rust-lang.org/cargo-dist/${CARGO_SNAPSHOT};name=cargo-snapshot \
 "
 
 LIC_FILES_CHKSUM += " \
-file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
 file://LICENSE-THIRD-PARTY;md5=892ea68b169e69cfe75097fc38a15b56 \
 "
 

recipes-devtools/cargo/cargo_0.16.0.bb

@@ -1,4 +1,4 @@
-# Auto-Generated by cargo-bitbake 0.3.6
+# Auto-Generated by cargo-bitbake 0.3.8
 #
 inherit cargo
 
@@ -89,6 +89,7 @@ crate://crates.io/ws2_32-sys/0.2.1 \
 
 LIC_FILES_CHKSUM=" \
 file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
+file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
 "
 
 SUMMARY = "Cargo, a package manager for Rust."
@@ -98,4 +99,5 @@ LICENSE = "MIT | Apache-2.0"
 # includes this file if it exists but does not fail
 # this is useful for anything you may want to override from
 # what cargo-bitbake generates.
+include cargo-${PV}.inc
 include cargo.inc