Merge pull request #212 from OSSystems/master

Use libssh2 from system and upgrade cargo to 0.31.0

recipes-devtools/cargo/cargo-0.31.0.inc

@@ -0,0 +1,12 @@
+CARGO_SNAPSHOT = "cargo-0.30.0-${BUILD_ARCH}-unknown-linux-gnu"
+
+SRC_URI[cargo-snapshot-x86_64.md5sum] = "79b62c75b11ef480163276be189fdac5"
+SRC_URI[cargo-snapshot-x86_64.sha256sum] = "32f210fd3142fda7825a06e95d1aa4b54035c2da435d8cf0dd03fad410c8002f"
+
+SRC_URI += "\
+    https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.gz;name=cargo-snapshot-${BUILD_ARCH} \
+"
+
+# When building cargo-native we don't have a built cargo to use so we must use
+# the snapshot to bootstrap the build of cargo
+CARGO_class-native = "${WORKDIR}/${CARGO_SNAPSHOT}/cargo/bin/cargo"

recipes-devtools/cargo/cargo.inc

@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM += " \
 file://LICENSE-THIRD-PARTY;md5=892ea68b169e69cfe75097fc38a15b56 \
 "
 
-# Used in libgit2-sys's build.rs, needed for pkg-config to be used
+# Needed for pkg-config to be used
 export LIBGIT2_SYS_USE_PKG_CONFIG = "1"
+export LIBSSH2_SYS_USE_PKG_CONFIG = "1"
 
 BBCLASSEXTEND = "native"

recipes-devtools/cargo/cargo_0.31.0.bb

@@ -0,0 +1,173 @@
+# Auto-Generated by cargo-bitbake 0.3.10
+#
+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.31.0"
+SRC_URI += "git://github.com/rust-lang/cargo;protocol=https;nobranch=1"
+SRCREV = "36d96825d0f288c6d1bb2219919a277968bd365f"
+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 += " \
+crate://crates.io/adler32/1.0.3 \
+crate://crates.io/aho-corasick/0.6.9 \
+crate://crates.io/ansi_term/0.11.0 \
+crate://crates.io/arrayvec/0.4.7 \
+crate://crates.io/atty/0.2.11 \
+crate://crates.io/backtrace-sys/0.1.24 \
+crate://crates.io/backtrace/0.3.9 \
+crate://crates.io/bitflags/1.0.4 \
+crate://crates.io/bufstream/0.1.4 \
+crate://crates.io/build_const/0.2.1 \
+crate://crates.io/cc/1.0.25 \
+crate://crates.io/cfg-if/0.1.6 \
+crate://crates.io/clap/2.32.0 \
+crate://crates.io/cloudabi/0.0.3 \
+crate://crates.io/commoncrypto-sys/0.2.0 \
+crate://crates.io/commoncrypto/0.2.0 \
+crate://crates.io/core-foundation-sys/0.6.2 \
+crate://crates.io/core-foundation/0.6.2 \
+crate://crates.io/crc/1.8.1 \
+crate://crates.io/crossbeam-channel/0.2.6 \
+crate://crates.io/crossbeam-epoch/0.6.0 \
+crate://crates.io/crossbeam-utils/0.5.0 \
+crate://crates.io/crypto-hash/0.3.1 \
+crate://crates.io/curl-sys/0.4.14 \
+crate://crates.io/curl/0.4.18 \
+crate://crates.io/env_logger/0.5.13 \
+crate://crates.io/failure/0.1.3 \
+crate://crates.io/failure_derive/0.1.3 \
+crate://crates.io/filetime/0.2.2 \
+crate://crates.io/flate2/1.0.4 \
+crate://crates.io/fnv/1.0.6 \
+crate://crates.io/foreign-types-shared/0.1.1 \
+crate://crates.io/foreign-types/0.3.2 \
+crate://crates.io/fs2/0.4.3 \
+crate://crates.io/fuchsia-zircon-sys/0.3.3 \
+crate://crates.io/fuchsia-zircon/0.3.3 \
+crate://crates.io/fwdansi/1.0.1 \
+crate://crates.io/git2-curl/0.8.2 \
+crate://crates.io/git2/0.7.5 \
+crate://crates.io/glob/0.2.11 \
+crate://crates.io/globset/0.4.2 \
+crate://crates.io/hex/0.3.2 \
+crate://crates.io/home/0.3.3 \
+crate://crates.io/humantime/1.1.1 \
+crate://crates.io/idna/0.1.5 \
+crate://crates.io/ignore/0.4.4 \
+crate://crates.io/itoa/0.4.3 \
+crate://crates.io/jobserver/0.1.11 \
+crate://crates.io/kernel32-sys/0.2.2 \
+crate://crates.io/lazy_static/1.2.0 \
+crate://crates.io/lazycell/1.2.0 \
+crate://crates.io/libc/0.2.43 \
+crate://crates.io/libgit2-sys/0.7.10 \
+crate://crates.io/libssh2-sys/0.2.11 \
+crate://crates.io/libz-sys/1.0.25 \
+crate://crates.io/lock_api/0.1.4 \
+crate://crates.io/log/0.4.6 \
+crate://crates.io/matches/0.1.8 \
+crate://crates.io/memchr/2.1.1 \
+crate://crates.io/memoffset/0.2.1 \
+crate://crates.io/miniz-sys/0.1.11 \
+crate://crates.io/miniz_oxide/0.2.0 \
+crate://crates.io/miniz_oxide_c_api/0.2.0 \
+crate://crates.io/miow/0.3.3 \
+crate://crates.io/nodrop/0.1.12 \
+crate://crates.io/num_cpus/1.8.0 \
+crate://crates.io/opener/0.3.0 \
+crate://crates.io/openssl-probe/0.1.2 \
+crate://crates.io/openssl-src/111.0.1+1.1.1 \
+crate://crates.io/openssl-sys/0.9.39 \
+crate://crates.io/openssl/0.10.15 \
+crate://crates.io/owning_ref/0.3.3 \
+crate://crates.io/parking_lot/0.6.4 \
+crate://crates.io/parking_lot_core/0.3.1 \
+crate://crates.io/percent-encoding/1.0.1 \
+crate://crates.io/pkg-config/0.3.14 \
+crate://crates.io/proc-macro2/0.4.20 \
+crate://crates.io/quick-error/1.2.2 \
+crate://crates.io/quote/0.6.9 \
+crate://crates.io/rand/0.4.3 \
+crate://crates.io/rand/0.5.5 \
+crate://crates.io/rand_core/0.2.2 \
+crate://crates.io/rand_core/0.3.0 \
+crate://crates.io/redox_syscall/0.1.40 \
+crate://crates.io/redox_termios/0.1.1 \
+crate://crates.io/regex-syntax/0.6.2 \
+crate://crates.io/regex/1.0.5 \
+crate://crates.io/remove_dir_all/0.5.1 \
+crate://crates.io/rustc-demangle/0.1.9 \
+crate://crates.io/rustc-workspace-hack/1.0.0 \
+crate://crates.io/rustc_version/0.2.3 \
+crate://crates.io/rustfix/0.4.2 \
+crate://crates.io/ryu/0.2.6 \
+crate://crates.io/same-file/1.0.4 \
+crate://crates.io/schannel/0.1.14 \
+crate://crates.io/scopeguard/0.3.3 \
+crate://crates.io/semver-parser/0.7.0 \
+crate://crates.io/semver/0.9.0 \
+crate://crates.io/serde/1.0.80 \
+crate://crates.io/serde_derive/1.0.80 \
+crate://crates.io/serde_ignored/0.0.4 \
+crate://crates.io/serde_json/1.0.32 \
+crate://crates.io/shell-escape/0.1.4 \
+crate://crates.io/smallvec/0.6.5 \
+crate://crates.io/socket2/0.3.8 \
+crate://crates.io/stable_deref_trait/1.1.1 \
+crate://crates.io/strsim/0.7.0 \
+crate://crates.io/syn/0.15.18 \
+crate://crates.io/synstructure/0.10.1 \
+crate://crates.io/tar/0.4.18 \
+crate://crates.io/tempfile/3.0.4 \
+crate://crates.io/termcolor/1.0.4 \
+crate://crates.io/termion/1.5.1 \
+crate://crates.io/textwrap/0.10.0 \
+crate://crates.io/thread_local/0.3.6 \
+crate://crates.io/toml/0.4.8 \
+crate://crates.io/ucd-util/0.1.2 \
+crate://crates.io/unicode-bidi/0.3.4 \
+crate://crates.io/unicode-normalization/0.1.7 \
+crate://crates.io/unicode-width/0.1.5 \
+crate://crates.io/unicode-xid/0.1.0 \
+crate://crates.io/unreachable/1.0.0 \
+crate://crates.io/url/1.7.1 \
+crate://crates.io/utf8-ranges/1.0.2 \
+crate://crates.io/vcpkg/0.2.6 \
+crate://crates.io/vec_map/0.8.1 \
+crate://crates.io/version_check/0.1.5 \
+crate://crates.io/void/1.0.2 \
+crate://crates.io/walkdir/2.2.6 \
+crate://crates.io/winapi-build/0.1.1 \
+crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
+crate://crates.io/winapi-util/0.1.1 \
+crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
+crate://crates.io/winapi/0.2.8 \
+crate://crates.io/winapi/0.3.6 \
+crate://crates.io/wincolor/1.0.1 \
+"
+
+
+
+# FIXME: update generateme with the real MD5 of the license file
+LIC_FILES_CHKSUM=" \
+file://LICENSE-MIT;md5=b377b220f43d747efdec40d69fcaa69d \
+file://LICENSE-APACHE;md5=1836efb2eb779966696f473ee8540542 \
+"
+
+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-${PV}.inc
+include cargo.inc