From a09d24f32196863bd49eb110e52032788b4c2291 Mon Sep 17 00:00:00 2001 From: Leon Anavi Date: Mon, 9 Jan 2017 17:17:38 +0200 Subject: rvi-sota-client: Update and fix rust-openssl Update the version of RVI SOTA Client as well as all crates on which it depends. Furthermore the patch includes improvements for the deployment of the systemd service and removes the old work around for rust-openssl. Dbus has been moved from RDEPENDS to DEPENDS to ensure that RVI SOTA client will be built successfully. Bug-AGL: SPEC-385 Change-Id: If276aac45b582d7d1ddb5b702fb4f40937d38e75 Signed-off-by: Leon Anavi --- .../rvi-sota-client/rvi-sota-client_git.bb | 78 ++++++++++------------ 1 file changed, 37 insertions(+), 41 deletions(-) diff --git a/meta-sota/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb b/meta-sota/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb index 9a7ec10..8a9d8ce 100644 --- a/meta-sota/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb +++ b/meta-sota/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb @@ -6,9 +6,12 @@ LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=65d26fcc2f35ea6a181ac777e42db1ea" inherit cargo systemd +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE_${PN} = "sota_client.service" + S = "${WORKDIR}/git" -SRCREV = "72e6096d9122cde2d9ece4e2693bd470e2b57abe" +SRCREV = "fe04468871d3d6b784eabc507ed68cef80b4dea1" # Generate with: # git describe --tags | cut -b2- @@ -18,36 +21,38 @@ BBCLASSEXTEND = "native" FILES_${PN} = " \ ${bindir}/sota_client \ - ${bindir}/system_info.sh \ + ${bindir}/sota_start.sh \ + ${bindir}/sota_sysinfo.sh \ ${sysconfdir}/sota_client.version \ ${sysconfdir}/sota_certificates \ - ${systemd_unitdir}/system/sota_client.service \ + ${systemd_system_unitdir}/sota_client.service \ ${bindir}/sota_ostree.sh \ " SRC_URI = " \ crate://crates.io/aho-corasick/0.5.3 \ crate://crates.io/time/0.1.35 \ -crate://crates.io/url/1.2.1 \ +crate://crates.io/url/1.2.3 \ crate://crates.io/ws2_32-sys/0.2.1 \ -crate://crates.io/hyper/0.9.4 \ +crate://crates.io/hyper/0.9.14 \ crate://crates.io/log/0.3.6 \ crate://crates.io/unicase/1.4.0 \ crate://crates.io/bitflags/0.7.0 \ crate://crates.io/bit-set/0.2.0 \ -crate://crates.io/lazy_static/0.2.1 \ +crate://crates.io/lazy_static/0.2.2 \ +crate://crates.io/lazy_static/0.1.16 \ crate://crates.io/rust-crypto/0.2.36 \ crate://crates.io/typeable/0.1.2 \ crate://crates.io/pkg-config/0.3.8 \ -crate://crates.io/httparse/1.1.2 \ -crate://crates.io/openssl/0.8.3 \ +crate://crates.io/httparse/1.2.1 \ +crate://crates.io/openssl/0.9.3 \ crate://crates.io/user32-sys/0.2.0 \ -crate://crates.io/regex/0.1.77 \ +crate://crates.io/regex/0.1.80 \ crate://crates.io/unicode-normalization/0.1.2 \ crate://crates.io/idna/0.1.0 \ crate://crates.io/unicode-bidi/0.2.3 \ -crate://crates.io/rand/0.3.14 \ -crate://crates.io/gcc/0.3.37 \ +crate://crates.io/rand/0.3.15 \ +crate://crates.io/gcc/0.3.40 \ crate://crates.io/chan/0.1.18 \ crate://crates.io/kernel32-sys/0.2.2 \ crate://crates.io/winapi/0.2.8 \ @@ -67,10 +72,10 @@ crate://crates.io/quick-error/0.2.2 \ crate://crates.io/ws/0.5.3 \ crate://crates.io/traitobject/0.0.1 \ crate://crates.io/cfg-if/0.1.0 \ -crate://crates.io/matches/0.1.3 \ +crate://crates.io/matches/0.1.4 \ crate://crates.io/getopts/0.2.14 \ crate://crates.io/sha1/0.2.0 \ -crate://crates.io/openssl-sys/0.7.17 \ +crate://crates.io/openssl-sys/0.9.3 \ crate://crates.io/cookie/0.2.5 \ crate://crates.io/libressl-pnacl-sys/2.1.6 \ crate://crates.io/language-tags/0.2.2 \ @@ -79,63 +84,54 @@ crate://crates.io/unix_socket/0.5.0 \ crate://crates.io/memchr/0.1.11 \ crate://crates.io/gdi32-sys/0.2.0 \ crate://crates.io/nom/1.2.4 \ -crate://crates.io/mio/0.5.1 \ +crate://crates.io/mio/0.6.1 \ crate://crates.io/tempdir/0.3.5 \ -crate://crates.io/miow/0.1.3 \ +crate://crates.io/miow/0.1.4 \ crate://crates.io/pnacl-build-helper/1.4.10 \ -crate://crates.io/libc/0.2.17 \ -crate://crates.io/nix/0.5.1 \ +crate://crates.io/libc/0.2.18 \ +crate://crates.io/nix/0.7.0 \ crate://crates.io/rustc_version/0.1.7 \ -crate://crates.io/slab/0.1.3 \ -crate://crates.io/rustc-serialize/0.3.19 \ +crate://crates.io/slab/0.3.0 \ +crate://crates.io/rustc-serialize/0.3.22 \ crate://crates.io/env_logger/0.3.5 \ crate://crates.io/vecio/0.1.0 \ crate://crates.io/rotor/0.6.3 \ crate://crates.io/openssl-sys-extras/0.7.14 \ -crate://crates.io/regex-syntax/0.3.7 \ +crate://crates.io/regex-syntax/0.3.9 \ crate://crates.io/bytes/0.3.0 \ crate://crates.io/void/1.0.2 \ crate://crates.io/spmc/0.2.1 \ crate://crates.io/openssl-verify/0.1.0 \ +crate://crates.io/num_cpus/1.2.0 \ +crate://crates.io/solicit/0.4.4 \ +crate://crates.io/lazycell/0.4.0 \ +crate://crates.io/hpack/0.2.0 \ crate-index://crates.io/7670a5aa394d0dcd7598905b352d1634ca74d84a \ -git://github.com/advancedtelematic/rvi_sota_client \ +git://github.com/advancedtelematic/rvi_sota_client.git;protocol=https \ " + SRC_URI[index.md5sum] = "79f10f436dbf26737cc80445746f16b4" SRC_URI[index.sha256sum] = "86114b93f1f51aaf0aec3af0751d214b351f4ff9839ba031315c1b19dcbb1913" -SYSTEMD_SERVICE_${PN} = "sota_client.service" - -DEPENDS += " openssl " +DEPENDS += " openssl dbus " RDEPENDS_${PN} = " libcrypto \ libssl \ - dbus \ bash \ lshw \ jq \ " export SOTA_VERSION = "${PV}" -do_compile_prepend() { - # Fetch and build the specific build of hyper that is specified in cargo.toml. - # meta-rust doesn't support fetching crates that don't point to a specific tag - # and rvi-sota-client needs a specific work-around to function correctly. - make rust-openssl -} - -do_compile_append() { - # Ensure that the 'make rust-openssl' above resulted in the local build of - # rust-openssl being used rather than the default one. - strings target/${TARGET_SYS}/release/sota_client | grep ${EXTENDPE}${PV}-${PR}/git/rust-openssl -q || (bberror "local rust-open ssl package not used"; exit 1) -} - do_install() { install -d ${D}${bindir} install -m 0755 target/${TARGET_SYS}/release/sota_client ${D}${bindir} - install -m 0755 run/system_info.sh ${D}${bindir} + install -m 0755 run/sota_start.sh ${D}${bindir} + install -m 0755 run/sota_sysinfo.sh ${D}${bindir} install -m 0755 run/sota_ostree.sh ${D}${bindir} - install -d ${D}${systemd_unitdir}/system - install -c ${S}/run/sota_client.service ${D}${systemd_unitdir}/system + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -m 644 -p -D ${S}/run/sota_client_ostree.service ${D}${systemd_system_unitdir}/sota_client.service + fi install -d ${D}${sysconfdir} install -c ${S}/run/sota_certificates ${D}${sysconfdir} -- cgit 1.2.3-korg