summaryrefslogtreecommitdiffstats
path: root/meta-sota
diff options
context:
space:
mode:
Diffstat (limited to 'meta-sota')
-rw-r--r--meta-sota/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb78
-rw-r--r--meta-sota/recipes-support/libgit2/libgit2-release.inc2
-rw-r--r--meta-sota/recipes-support/libgit2/libgit2.inc19
-rw-r--r--meta-sota/recipes-support/libgit2/libgit2_0.24.1.bb4
4 files changed, 37 insertions, 66 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}
diff --git a/meta-sota/recipes-support/libgit2/libgit2-release.inc b/meta-sota/recipes-support/libgit2/libgit2-release.inc
deleted file mode 100644
index 62a13cf..0000000
--- a/meta-sota/recipes-support/libgit2/libgit2-release.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-require libgit2.inc
-SRC_URI = "https://github.com/libgit2/libgit2/archive/v${PV}.tar.gz"
diff --git a/meta-sota/recipes-support/libgit2/libgit2.inc b/meta-sota/recipes-support/libgit2/libgit2.inc
deleted file mode 100644
index fe0f647..0000000
--- a/meta-sota/recipes-support/libgit2/libgit2.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "the Git linkable library"
-HOMEPAGE = "http://libgit2.github.com/"
-LICENSE = "GPL-2.0-with-GCC-exception"
-
-DEPENDS = "openssl zlib"
-
-inherit cmake
-
-# CLAR = tests, needs python-native
-EXTRA_OECMAKE = "\
- -DTHREADSAFE=ON \
- -DBUILD_CLAR=OFF \
- -DSHA1_TYPE="builtin" \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DBUILD_SHARED_LIBS=OFF \
- -DBUILD_EXAMPLES=OFF \
-"
-
-BBCLASSEXTEND = "native"
diff --git a/meta-sota/recipes-support/libgit2/libgit2_0.24.1.bb b/meta-sota/recipes-support/libgit2/libgit2_0.24.1.bb
deleted file mode 100644
index 2d0c6ff..0000000
--- a/meta-sota/recipes-support/libgit2/libgit2_0.24.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-LIC_FILES_CHKSUM = "file://COPYING;md5=34197a479f637beb9e09e56893f48bc2"
-SRC_URI[md5sum] = "3674ca2d40388b1175e25b6f5a3a82ad"
-SRC_URI[sha256sum] = "60198cbb34066b9b5c1613d15c0479f6cd25f4aef42f7ec515cd1cc13a77fede"
-require libgit2-release.inc