cargo: convert recipe to cargo-bitbake

Generate the Cargo recipe with cargo-bitbake instead of having a handcrafted recipe. This should make future version bumps easier. Three known issues: - license checksum of the Apache license is a generateme value due to the license file having a difference name then what's in Cargo.toml. - branch= value was wrong for tags. Pointed to HEAD instead of the branch that the underlying tag commit came from. - Use https protocol when the repo is publicly accessible.
2017-06-21 10:45:16 -05:00
parent c55fb403f8
commit 398fecb48c
2 changed files with 100 additions and 81 deletions
@@ -1,17 +1,18 @@
-inherit cargo
-inherit patch
+require cargo-snapshot.inc

-SUMMARY = "Cargo downloads your Rust project's dependencies and builds your project"
-HOMEPAGE = "http://crates.io"
 SECTION = "devel"
-LICENSE = "MIT | Apache-2.0"

 DEPENDS = "openssl zlib libgit2 curl ca-certificates libssh2"

-SRC_URI = "\
+SRC_URI += "\
 	http://static-rust-lang-org.s3.amazonaws.com/cargo-dist/${CARGO_SNAPSHOT} \
 "

+LIC_FILES_CHKSUM += " \
+file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
+file://LICENSE-THIRD-PARTY;md5=892ea68b169e69cfe75097fc38a15b56 \
+"
+
 # Used in libgit2-sys's build.rs, needed for pkg-config to be used
 export LIBGIT2_SYS_USE_PKG_CONFIG = "1"

@@ -1,83 +1,101 @@
-require cargo-snapshot.inc
-require cargo.inc
+# Auto-Generated by cargo-bitbake 0.3.6
+#
+inherit cargo

+# If this is git based prefer versioned ones if they exist
+# DEFAULT_PREFERENCE = "-1"
+
+# how to get cargo could be as easy as but default to a git checkout:
+# SRC_URI += "crate://crates.io/cargo/0.16.0"
+SRC_URI += "git://git@github.com/rust-lang/cargo.git;protocol=https;branch=rust-1.15.1"
+SRCREV = "6e0c18cccc8b0c06fba8a8d76486f81a792fb420"
+S = "${WORKDIR}/git"
+CARGO_SRC_DIR=""
+
+
+# please note if you have entries that do not begin with crate://
+# you must change them to how that package can be fetched
 SRC_URI += " \
-    git://github.com/rust-lang/cargo.git;protocol=https;name=cargo;branch=rust-1.15.1 \
-    crate://crates.io/advapi32-sys/0.2.0 \
-    crate://crates.io/aho-corasick/0.5.3 \
-    crate://crates.io/bitflags/0.7.0 \
-    crate://crates.io/bufstream/0.1.2 \
-    crate://crates.io/cfg-if/0.1.0 \
-    crate://crates.io/cmake/0.1.19 \
-    crate://crates.io/crossbeam/0.2.10 \
-    crate://crates.io/curl-sys/0.3.6 \
-    crate://crates.io/curl/0.4.1 \
-    crate://crates.io/docopt/0.6.86 \
-    crate://crates.io/env_logger/0.3.5 \
-    crate://crates.io/filetime/0.1.10 \
-    crate://crates.io/flate2/0.2.14 \
-    crate://crates.io/fs2/0.3.0 \
-    crate://crates.io/gcc/0.3.39 \
-    crate://crates.io/gdi32-sys/0.2.0 \
-    crate://crates.io/git2-curl/0.7.0 \
-    crate://crates.io/git2/0.6.3 \
-    crate://crates.io/glob/0.2.11 \
-    crate://crates.io/hamcrest/0.1.1 \
-    crate://crates.io/idna/0.1.0 \
-    crate://crates.io/kernel32-sys/0.2.2 \
-    crate://crates.io/lazy_static/0.2.2 \
-    crate://crates.io/libc/0.2.18 \
-    crate://crates.io/libgit2-sys/0.6.5 \
-    crate://crates.io/libssh2-sys/0.2.4 \
-    crate://crates.io/libz-sys/1.0.10 \
-    crate://crates.io/log/0.3.6 \
-    crate://crates.io/matches/0.1.4 \
-    crate://crates.io/memchr/0.1.11 \
-    crate://crates.io/miniz-sys/0.1.7 \
-    crate://crates.io/miow/0.1.3 \
-    crate://crates.io/net2/0.2.26 \
-    crate://crates.io/num-bigint/0.1.35 \
-    crate://crates.io/num-complex/0.1.35 \
-    crate://crates.io/num-integer/0.1.32 \
-    crate://crates.io/num-iter/0.1.32 \
-    crate://crates.io/num-rational/0.1.35 \
-    crate://crates.io/num-traits/0.1.36 \
-    crate://crates.io/num/0.1.36 \
-    crate://crates.io/num_cpus/1.1.0 \
-    crate://crates.io/openssl-probe/0.1.0 \
-    crate://crates.io/openssl-sys/0.9.1 \
-    crate://crates.io/openssl/0.9.1 \
-    crate://crates.io/pkg-config/0.3.8 \
-    crate://crates.io/psapi-sys/0.1.0 \
-    crate://crates.io/rand/0.3.14 \
-    crate://crates.io/regex-syntax/0.3.9 \
-    crate://crates.io/regex/0.1.80 \
-    crate://crates.io/rustc-serialize/0.3.21 \
-    crate://crates.io/semver-parser/0.6.1 \
-    crate://crates.io/semver/0.5.1 \
-    crate://crates.io/strsim/0.5.1 \
-    crate://crates.io/tar/0.4.9 \
-    crate://crates.io/tempdir/0.3.5 \
-    crate://crates.io/term/0.4.4 \
-    crate://crates.io/thread-id/2.0.0 \
-    crate://crates.io/thread_local/0.2.7 \
-    crate://crates.io/toml/0.2.1 \
-    crate://crates.io/unicode-bidi/0.2.3 \
-    crate://crates.io/unicode-normalization/0.1.2 \
-    crate://crates.io/url/1.2.3 \
-    crate://crates.io/user32-sys/0.2.0 \
-    crate://crates.io/utf8-ranges/0.1.3 \
-    crate://crates.io/winapi-build/0.1.1 \
-    crate://crates.io/winapi/0.2.8 \
-    crate://crates.io/ws2_32-sys/0.2.1 \
+crate://crates.io/advapi32-sys/0.2.0 \
+crate://crates.io/aho-corasick/0.5.3 \
+crate://crates.io/bitflags/0.7.0 \
+crate://crates.io/bufstream/0.1.2 \
+crate://crates.io/cfg-if/0.1.0 \
+crate://crates.io/cmake/0.1.19 \
+crate://crates.io/crossbeam/0.2.10 \
+crate://crates.io/curl-sys/0.3.6 \
+crate://crates.io/curl/0.4.1 \
+crate://crates.io/docopt/0.6.86 \
+crate://crates.io/env_logger/0.3.5 \
+crate://crates.io/filetime/0.1.10 \
+crate://crates.io/flate2/0.2.14 \
+crate://crates.io/fs2/0.3.0 \
+crate://crates.io/gcc/0.3.39 \
+crate://crates.io/gdi32-sys/0.2.0 \
+crate://crates.io/git2-curl/0.7.0 \
+crate://crates.io/git2/0.6.3 \
+crate://crates.io/glob/0.2.11 \
+crate://crates.io/hamcrest/0.1.1 \
+crate://crates.io/idna/0.1.0 \
+crate://crates.io/kernel32-sys/0.2.2 \
+crate://crates.io/lazy_static/0.2.2 \
+crate://crates.io/libc/0.2.18 \
+crate://crates.io/libgit2-sys/0.6.5 \
+crate://crates.io/libssh2-sys/0.2.4 \
+crate://crates.io/libz-sys/1.0.10 \
+crate://crates.io/log/0.3.6 \
+crate://crates.io/matches/0.1.4 \
+crate://crates.io/memchr/0.1.11 \
+crate://crates.io/miniz-sys/0.1.7 \
+crate://crates.io/miow/0.1.3 \
+crate://crates.io/net2/0.2.26 \
+crate://crates.io/num-bigint/0.1.35 \
+crate://crates.io/num-complex/0.1.35 \
+crate://crates.io/num-integer/0.1.32 \
+crate://crates.io/num-iter/0.1.32 \
+crate://crates.io/num-rational/0.1.35 \
+crate://crates.io/num-traits/0.1.36 \
+crate://crates.io/num/0.1.36 \
+crate://crates.io/num_cpus/1.1.0 \
+crate://crates.io/openssl-probe/0.1.0 \
+crate://crates.io/openssl-sys/0.9.1 \
+crate://crates.io/openssl/0.9.1 \
+crate://crates.io/pkg-config/0.3.8 \
+crate://crates.io/psapi-sys/0.1.0 \
+crate://crates.io/rand/0.3.14 \
+crate://crates.io/regex-syntax/0.3.9 \
+crate://crates.io/regex/0.1.80 \
+crate://crates.io/rustc-serialize/0.3.21 \
+crate://crates.io/semver-parser/0.6.1 \
+crate://crates.io/semver/0.5.1 \
+crate://crates.io/strsim/0.5.1 \
+crate://crates.io/tar/0.4.9 \
+crate://crates.io/tempdir/0.3.5 \
+crate://crates.io/term/0.4.4 \
+crate://crates.io/thread-id/2.0.0 \
+crate://crates.io/thread_local/0.2.7 \
+crate://crates.io/toml/0.2.1 \
+crate://crates.io/unicode-bidi/0.2.3 \
+crate://crates.io/unicode-normalization/0.1.2 \
+crate://crates.io/url/1.2.3 \
+crate://crates.io/user32-sys/0.2.0 \
+crate://crates.io/utf8-ranges/0.1.3 \
+crate://crates.io/winapi-build/0.1.1 \
+crate://crates.io/winapi/0.2.8 \
+crate://crates.io/ws2_32-sys/0.2.1 \
 "

-SRCREV_cargo = "6e0c18cccc8b0c06fba8a8d76486f81a792fb420"

-S = "${WORKDIR}/git"

 LIC_FILES_CHKSUM=" \
-    file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
-    file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
-    file://LICENSE-THIRD-PARTY;md5=892ea68b169e69cfe75097fc38a15b56 \
+file://LICENSE-MIT;md5=362255802eb5aa87810d12ddf3cfedb4 \
 "
+
+SUMMARY = "Cargo, a package manager for Rust."
+HOMEPAGE = "https://crates.io"
+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.inc