Merge pull request #71 from advancedtelematic/feat/PRO-3157-use-random-friendly-names

PRO-3157 Add recipe for friendly name generator

2 files changed, 54 insertions, 40 deletions

diff --git a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
index 9ba11ea..52edd26 100644
--- a/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
+++ b/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
@@ -11,13 +11,13 @@ S = "${WORKDIR}/git"
 # When changing this, don't forget to:
 # 1) Update PV
 # 2) Check that Cargo.lock hasn't changed with git diff old..new Cargo.lock
-SRCREV = "878aa386e61bc253e4fae624ae62507710cd23f3"
+SRCREV = "0d092c218c823fe38e59e7ecb4589c3770dc6448"
 
 # Generate with:
 #   git describe --tags | cut -b2-
 # or from the rvi_sota_client repo:
 #   make package-version
-PV = "0.2.32-131-g878aa38"
+PV = "0.2.32-186-g313ba1a"
 
 BBCLASSEXTEND = "native"
 
@@ -27,7 +27,6 @@ FILES_${PN} = " \
                 ${bindir}/sota_client \
                 ${bindir}/sota_sysinfo.sh \
                 ${bindir}/system_info.sh \
-                ${bindir}/sota_ostree.sh \
                 ${bindir}/sota_prov.sh \
                 ${sysconfdir}/sota_client.version \
                 ${sysconfdir}/sota_certificates \
@@ -40,82 +39,82 @@ FILES_${PN} = " \
 # list of dependencies can be generated from Cargo.lock by running
 #   cat Cargo.lock | sed -e '1,/metadata/ d' Cargo.lock | awk '{print "crate://crates.io/"$2 "/" $3" \\"}'
 SRC_URI = " \
-crate://crates.io/aho-corasick/0.5.3 \
 crate://crates.io/aho-corasick/0.6.3 \
-crate://crates.io/base64/0.4.1 \
+crate://crates.io/backtrace/0.3.0 \
+crate://crates.io/backtrace-sys/0.1.10 \
+crate://crates.io/base64/0.4.2 \
+crate://crates.io/base64/0.5.2 \
 crate://crates.io/bit-set/0.4.0 \
 crate://crates.io/bit-vec/0.4.3 \
-crate://crates.io/bitflags/0.7.0 \
+crate://crates.io/bitflags/0.8.2 \
 crate://crates.io/byteorder/1.0.0 \
-crate://crates.io/bytes/0.4.1 \
+crate://crates.io/bytes/0.4.3 \
 crate://crates.io/cfg-if/0.1.0 \
 crate://crates.io/chan/0.1.19 \
 crate://crates.io/chan-signal/0.2.0 \
-crate://crates.io/chrono/0.3.0 \
+crate://crates.io/chrono/0.3.1 \
 crate://crates.io/crossbeam/0.2.10 \
+crate://crates.io/dbghelp-sys/0.2.0 \
 crate://crates.io/dbus/0.5.2 \
-crate://crates.io/deque/0.3.1 \
 crate://crates.io/dtoa/0.4.1 \
 crate://crates.io/env_logger/0.4.2 \
+crate://crates.io/error-chain/0.10.0 \
 crate://crates.io/error-chain/0.7.2 \
+crate://crates.io/filetime/0.1.10 \
 crate://crates.io/foreign-types/0.2.0 \
 crate://crates.io/gcc/0.3.45 \
 crate://crates.io/gdi32-sys/0.2.0 \
 crate://crates.io/getopts/0.2.14 \
-crate://crates.io/httparse/1.2.1 \
-crate://crates.io/hyper/0.10.5 \
-crate://crates.io/idna/0.1.0 \
+crate://crates.io/hex/0.2.0 \
+crate://crates.io/httparse/1.2.2 \
+crate://crates.io/hyper/0.10.9 \
+crate://crates.io/idna/0.1.1 \
 crate://crates.io/iovec/0.1.0 \
 crate://crates.io/itoa/0.3.1 \
 crate://crates.io/kernel32-sys/0.2.2 \
 crate://crates.io/language-tags/0.2.2 \
-crate://crates.io/lazy_static/0.2.5 \
-crate://crates.io/libc/0.2.21 \
+crate://crates.io/lazy_static/0.2.8 \
+crate://crates.io/libc/0.2.22 \
 crate://crates.io/log/0.3.7 \
 crate://crates.io/matches/0.1.4 \
-crate://crates.io/memchr/0.1.11 \
 crate://crates.io/memchr/1.0.1 \
 crate://crates.io/metadeps/1.1.1 \
 crate://crates.io/mime/0.2.3 \
-crate://crates.io/nom/1.2.4 \
 crate://crates.io/num/0.1.37 \
-crate://crates.io/num-integer/0.1.33 \
+crate://crates.io/num-integer/0.1.34 \
 crate://crates.io/num-iter/0.1.33 \
 crate://crates.io/num-traits/0.1.37 \
-crate://crates.io/num_cpus/1.3.0 \
-crate://crates.io/openssl/0.9.10 \
-crate://crates.io/openssl-sys/0.9.10 \
-crate://crates.io/pem/0.2.0 \
+crate://crates.io/num_cpus/1.4.0 \
+crate://crates.io/openssl/0.9.11 \
+crate://crates.io/openssl-sys/0.9.11 \
+crate://crates.io/pem/0.4.0 \
 crate://crates.io/pkg-config/0.3.9 \
 crate://crates.io/quote/0.3.15 \
 crate://crates.io/rand/0.3.15 \
-crate://crates.io/rayon/0.6.0 \
 crate://crates.io/redox_syscall/0.1.17 \
-crate://crates.io/regex/0.1.80 \
 crate://crates.io/regex/0.2.1 \
-crate://crates.io/regex-syntax/0.3.9 \
 crate://crates.io/regex-syntax/0.4.0 \
 crate://crates.io/ring/0.7.1 \
 crate://crates.io/rust-crypto/0.2.36 \
-crate://crates.io/rustc-serialize/0.3.23 \
+crate://crates.io/rustc-demangle/0.1.4 \
+crate://crates.io/rustc-serialize/0.3.24 \
 crate://crates.io/rustc_version/0.1.7 \
 crate://crates.io/semver/0.1.20 \
-crate://crates.io/serde/0.9.11 \
-crate://crates.io/serde_codegen_internals/0.14.1 \
-crate://crates.io/serde_derive/0.9.11 \
-crate://crates.io/serde_json/0.9.9 \
+crate://crates.io/serde/1.0.2 \
+crate://crates.io/serde_derive/1.0.2 \
+crate://crates.io/serde_derive_internals/0.15.0 \
+crate://crates.io/serde_json/1.0.1 \
 crate://crates.io/sha1/0.2.0 \
-crate://crates.io/syn/0.11.9 \
+crate://crates.io/syn/0.11.11 \
 crate://crates.io/synom/0.11.3 \
-crate://crates.io/thread-id/2.0.0 \
+crate://crates.io/tar/0.4.11 \
 crate://crates.io/thread-id/3.0.0 \
-crate://crates.io/thread_local/0.2.7 \
 crate://crates.io/thread_local/0.3.3 \
-crate://crates.io/time/0.1.36 \
+crate://crates.io/time/0.1.37 \
 crate://crates.io/toml/0.2.1 \
-crate://crates.io/toml/0.3.1 \
+crate://crates.io/toml/0.4.0 \
 crate://crates.io/traitobject/0.1.0 \
-crate://crates.io/tungstenite/0.1.1 \
+crate://crates.io/tungstenite/0.2.2 \
 crate://crates.io/typeable/0.1.2 \
 crate://crates.io/unicase/1.4.0 \
 crate://crates.io/unicode-bidi/0.2.5 \
@@ -127,17 +126,17 @@ crate://crates.io/untrusted/0.3.2 \
 crate://crates.io/url/1.4.0 \
 crate://crates.io/user32-sys/0.2.0 \
 crate://crates.io/utf-8/0.7.0 \
-crate://crates.io/utf8-ranges/0.1.3 \
 crate://crates.io/utf8-ranges/1.0.0 \
-crate://crates.io/uuid/0.4.0 \
+crate://crates.io/uuid/0.5.0 \
 crate://crates.io/void/1.0.2 \
 crate://crates.io/winapi/0.2.8 \
 crate://crates.io/winapi-build/0.1.1 \
+crate://crates.io/xattr/0.1.11 \
 git://github.com/advancedtelematic/rvi_sota_client \
 "
 
-SRC_URI[index.md5sum] = "79f10f436dbf26737cc80445746f16b4"
-SRC_URI[index.sha256sum] = "86114b93f1f51aaf0aec3af0751d214b351f4ff9839ba031315c1b19dcbb1913"
+SRC_URI[index.md5sum] = "6a635e8a081b4d4ba4cebffd721c2d7d"
+SRC_URI[index.sha256sum] = "1913c41d4b8de89a931b6f9e418f83e70a083e12e6c247e8510ee932571ebae2"
 
 SYSTEMD_SERVICE_${PN} = "sota_client.service sota_client_autoprovision.service"
 
@@ -151,6 +150,7 @@ RDEPENDS_${PN} = " libcrypto \
                    python \
                    python-canonicaljson \
                    python-json \
+                   python-petname \
                    "
 
 export SOTA_PACKED_CREDENTIALS
@@ -166,7 +166,6 @@ do_install() {
   install -m 0755 target/${TARGET_SYS}/release/sota_client ${D}${bindir}
   install -m 0755 ${S}/run/sota_sysinfo.sh ${D}${bindir}
   ln -fs ${bindir}/sota_sysinfo.sh ${D}${bindir}/system_info.sh  # For compatibilty with old sota.toml files
-  install -m 0755 ${S}/run/sota_ostree.sh ${D}${bindir}
   install -m 0755 ${S}/run/sota_prov.sh ${D}${bindir}
   install -m 0755 ${S}/run/canonical_json.py ${D}${bindir}
 
diff --git a/recipes-support/python-petname/python-petname.bb b/recipes-support/python-petname/python-petname.bb
new file mode 100644
index 0000000..b8a7b88
--- /dev/null
+++ b/recipes-support/python-petname/python-petname.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "python-petname recipe"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRCREV = "d0b767cdb1567defb104f29c3fd022239a7f231e"
+SRC_URI = "git://github.com/dustinkirkland/python-petname.git"
+S = "${WORKDIR}/git"
+
+PV = "2.2"
+inherit setuptools
+RDEPENDS_${PN} = " python-setuptools \
+                   python-argparse \
+                   "
+