diff options
-rw-r--r-- | recipes-sota/rvi-sota-client/rvi-sota-client_git.bb | 79 | ||||
-rw-r--r-- | recipes-support/python-petname/python-petname.bb | 15 |
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" | |||
11 | # When changing this, don't forget to: | 11 | # When changing this, don't forget to: |
12 | # 1) Update PV | 12 | # 1) Update PV |
13 | # 2) Check that Cargo.lock hasn't changed with git diff old..new Cargo.lock | 13 | # 2) Check that Cargo.lock hasn't changed with git diff old..new Cargo.lock |
14 | SRCREV = "878aa386e61bc253e4fae624ae62507710cd23f3" | 14 | SRCREV = "0d092c218c823fe38e59e7ecb4589c3770dc6448" |
15 | 15 | ||
16 | # Generate with: | 16 | # Generate with: |
17 | # git describe --tags | cut -b2- | 17 | # git describe --tags | cut -b2- |
18 | # or from the rvi_sota_client repo: | 18 | # or from the rvi_sota_client repo: |
19 | # make package-version | 19 | # make package-version |
20 | PV = "0.2.32-131-g878aa38" | 20 | PV = "0.2.32-186-g313ba1a" |
21 | 21 | ||
22 | BBCLASSEXTEND = "native" | 22 | BBCLASSEXTEND = "native" |
23 | 23 | ||
@@ -27,7 +27,6 @@ FILES_${PN} = " \ | |||
27 | ${bindir}/sota_client \ | 27 | ${bindir}/sota_client \ |
28 | ${bindir}/sota_sysinfo.sh \ | 28 | ${bindir}/sota_sysinfo.sh \ |
29 | ${bindir}/system_info.sh \ | 29 | ${bindir}/system_info.sh \ |
30 | ${bindir}/sota_ostree.sh \ | ||
31 | ${bindir}/sota_prov.sh \ | 30 | ${bindir}/sota_prov.sh \ |
32 | ${sysconfdir}/sota_client.version \ | 31 | ${sysconfdir}/sota_client.version \ |
33 | ${sysconfdir}/sota_certificates \ | 32 | ${sysconfdir}/sota_certificates \ |
@@ -40,82 +39,82 @@ FILES_${PN} = " \ | |||
40 | # list of dependencies can be generated from Cargo.lock by running | 39 | # list of dependencies can be generated from Cargo.lock by running |
41 | # cat Cargo.lock | sed -e '1,/metadata/ d' Cargo.lock | awk '{print "crate://crates.io/"$2 "/" $3" \\"}' | 40 | # cat Cargo.lock | sed -e '1,/metadata/ d' Cargo.lock | awk '{print "crate://crates.io/"$2 "/" $3" \\"}' |
42 | SRC_URI = " \ | 41 | SRC_URI = " \ |
43 | crate://crates.io/aho-corasick/0.5.3 \ | ||
44 | crate://crates.io/aho-corasick/0.6.3 \ | 42 | crate://crates.io/aho-corasick/0.6.3 \ |
45 | crate://crates.io/base64/0.4.1 \ | 43 | crate://crates.io/backtrace/0.3.0 \ |
44 | crate://crates.io/backtrace-sys/0.1.10 \ | ||
45 | crate://crates.io/base64/0.4.2 \ | ||
46 | crate://crates.io/base64/0.5.2 \ | ||
46 | crate://crates.io/bit-set/0.4.0 \ | 47 | crate://crates.io/bit-set/0.4.0 \ |
47 | crate://crates.io/bit-vec/0.4.3 \ | 48 | crate://crates.io/bit-vec/0.4.3 \ |
48 | crate://crates.io/bitflags/0.7.0 \ | 49 | crate://crates.io/bitflags/0.8.2 \ |
49 | crate://crates.io/byteorder/1.0.0 \ | 50 | crate://crates.io/byteorder/1.0.0 \ |
50 | crate://crates.io/bytes/0.4.1 \ | 51 | crate://crates.io/bytes/0.4.3 \ |
51 | crate://crates.io/cfg-if/0.1.0 \ | 52 | crate://crates.io/cfg-if/0.1.0 \ |
52 | crate://crates.io/chan/0.1.19 \ | 53 | crate://crates.io/chan/0.1.19 \ |
53 | crate://crates.io/chan-signal/0.2.0 \ | 54 | crate://crates.io/chan-signal/0.2.0 \ |
54 | crate://crates.io/chrono/0.3.0 \ | 55 | crate://crates.io/chrono/0.3.1 \ |
55 | crate://crates.io/crossbeam/0.2.10 \ | 56 | crate://crates.io/crossbeam/0.2.10 \ |
57 | crate://crates.io/dbghelp-sys/0.2.0 \ | ||
56 | crate://crates.io/dbus/0.5.2 \ | 58 | crate://crates.io/dbus/0.5.2 \ |
57 | crate://crates.io/deque/0.3.1 \ | ||
58 | crate://crates.io/dtoa/0.4.1 \ | 59 | crate://crates.io/dtoa/0.4.1 \ |
59 | crate://crates.io/env_logger/0.4.2 \ | 60 | crate://crates.io/env_logger/0.4.2 \ |
61 | crate://crates.io/error-chain/0.10.0 \ | ||
60 | crate://crates.io/error-chain/0.7.2 \ | 62 | crate://crates.io/error-chain/0.7.2 \ |
63 | crate://crates.io/filetime/0.1.10 \ | ||
61 | crate://crates.io/foreign-types/0.2.0 \ | 64 | crate://crates.io/foreign-types/0.2.0 \ |
62 | crate://crates.io/gcc/0.3.45 \ | 65 | crate://crates.io/gcc/0.3.45 \ |
63 | crate://crates.io/gdi32-sys/0.2.0 \ | 66 | crate://crates.io/gdi32-sys/0.2.0 \ |
64 | crate://crates.io/getopts/0.2.14 \ | 67 | crate://crates.io/getopts/0.2.14 \ |
65 | crate://crates.io/httparse/1.2.1 \ | 68 | crate://crates.io/hex/0.2.0 \ |
66 | crate://crates.io/hyper/0.10.5 \ | 69 | crate://crates.io/httparse/1.2.2 \ |
67 | crate://crates.io/idna/0.1.0 \ | 70 | crate://crates.io/hyper/0.10.9 \ |
71 | crate://crates.io/idna/0.1.1 \ | ||
68 | crate://crates.io/iovec/0.1.0 \ | 72 | crate://crates.io/iovec/0.1.0 \ |
69 | crate://crates.io/itoa/0.3.1 \ | 73 | crate://crates.io/itoa/0.3.1 \ |
70 | crate://crates.io/kernel32-sys/0.2.2 \ | 74 | crate://crates.io/kernel32-sys/0.2.2 \ |
71 | crate://crates.io/language-tags/0.2.2 \ | 75 | crate://crates.io/language-tags/0.2.2 \ |
72 | crate://crates.io/lazy_static/0.2.5 \ | 76 | crate://crates.io/lazy_static/0.2.8 \ |
73 | crate://crates.io/libc/0.2.21 \ | 77 | crate://crates.io/libc/0.2.22 \ |
74 | crate://crates.io/log/0.3.7 \ | 78 | crate://crates.io/log/0.3.7 \ |
75 | crate://crates.io/matches/0.1.4 \ | 79 | crate://crates.io/matches/0.1.4 \ |
76 | crate://crates.io/memchr/0.1.11 \ | ||
77 | crate://crates.io/memchr/1.0.1 \ | 80 | crate://crates.io/memchr/1.0.1 \ |
78 | crate://crates.io/metadeps/1.1.1 \ | 81 | crate://crates.io/metadeps/1.1.1 \ |
79 | crate://crates.io/mime/0.2.3 \ | 82 | crate://crates.io/mime/0.2.3 \ |
80 | crate://crates.io/nom/1.2.4 \ | ||
81 | crate://crates.io/num/0.1.37 \ | 83 | crate://crates.io/num/0.1.37 \ |
82 | crate://crates.io/num-integer/0.1.33 \ | 84 | crate://crates.io/num-integer/0.1.34 \ |
83 | crate://crates.io/num-iter/0.1.33 \ | 85 | crate://crates.io/num-iter/0.1.33 \ |
84 | crate://crates.io/num-traits/0.1.37 \ | 86 | crate://crates.io/num-traits/0.1.37 \ |
85 | crate://crates.io/num_cpus/1.3.0 \ | 87 | crate://crates.io/num_cpus/1.4.0 \ |
86 | crate://crates.io/openssl/0.9.10 \ | 88 | crate://crates.io/openssl/0.9.11 \ |
87 | crate://crates.io/openssl-sys/0.9.10 \ | 89 | crate://crates.io/openssl-sys/0.9.11 \ |
88 | crate://crates.io/pem/0.2.0 \ | 90 | crate://crates.io/pem/0.4.0 \ |
89 | crate://crates.io/pkg-config/0.3.9 \ | 91 | crate://crates.io/pkg-config/0.3.9 \ |
90 | crate://crates.io/quote/0.3.15 \ | 92 | crate://crates.io/quote/0.3.15 \ |
91 | crate://crates.io/rand/0.3.15 \ | 93 | crate://crates.io/rand/0.3.15 \ |
92 | crate://crates.io/rayon/0.6.0 \ | ||
93 | crate://crates.io/redox_syscall/0.1.17 \ | 94 | crate://crates.io/redox_syscall/0.1.17 \ |
94 | crate://crates.io/regex/0.1.80 \ | ||
95 | crate://crates.io/regex/0.2.1 \ | 95 | crate://crates.io/regex/0.2.1 \ |
96 | crate://crates.io/regex-syntax/0.3.9 \ | ||
97 | crate://crates.io/regex-syntax/0.4.0 \ | 96 | crate://crates.io/regex-syntax/0.4.0 \ |
98 | crate://crates.io/ring/0.7.1 \ | 97 | crate://crates.io/ring/0.7.1 \ |
99 | crate://crates.io/rust-crypto/0.2.36 \ | 98 | crate://crates.io/rust-crypto/0.2.36 \ |
100 | crate://crates.io/rustc-serialize/0.3.23 \ | 99 | crate://crates.io/rustc-demangle/0.1.4 \ |
100 | crate://crates.io/rustc-serialize/0.3.24 \ | ||
101 | crate://crates.io/rustc_version/0.1.7 \ | 101 | crate://crates.io/rustc_version/0.1.7 \ |
102 | crate://crates.io/semver/0.1.20 \ | 102 | crate://crates.io/semver/0.1.20 \ |
103 | crate://crates.io/serde/0.9.11 \ | 103 | crate://crates.io/serde/1.0.2 \ |
104 | crate://crates.io/serde_codegen_internals/0.14.1 \ | 104 | crate://crates.io/serde_derive/1.0.2 \ |
105 | crate://crates.io/serde_derive/0.9.11 \ | 105 | crate://crates.io/serde_derive_internals/0.15.0 \ |
106 | crate://crates.io/serde_json/0.9.9 \ | 106 | crate://crates.io/serde_json/1.0.1 \ |
107 | crate://crates.io/sha1/0.2.0 \ | 107 | crate://crates.io/sha1/0.2.0 \ |
108 | crate://crates.io/syn/0.11.9 \ | 108 | crate://crates.io/syn/0.11.11 \ |
109 | crate://crates.io/synom/0.11.3 \ | 109 | crate://crates.io/synom/0.11.3 \ |
110 | crate://crates.io/thread-id/2.0.0 \ | 110 | crate://crates.io/tar/0.4.11 \ |
111 | crate://crates.io/thread-id/3.0.0 \ | 111 | crate://crates.io/thread-id/3.0.0 \ |
112 | crate://crates.io/thread_local/0.2.7 \ | ||
113 | crate://crates.io/thread_local/0.3.3 \ | 112 | crate://crates.io/thread_local/0.3.3 \ |
114 | crate://crates.io/time/0.1.36 \ | 113 | crate://crates.io/time/0.1.37 \ |
115 | crate://crates.io/toml/0.2.1 \ | 114 | crate://crates.io/toml/0.2.1 \ |
116 | crate://crates.io/toml/0.3.1 \ | 115 | crate://crates.io/toml/0.4.0 \ |
117 | crate://crates.io/traitobject/0.1.0 \ | 116 | crate://crates.io/traitobject/0.1.0 \ |
118 | crate://crates.io/tungstenite/0.1.1 \ | 117 | crate://crates.io/tungstenite/0.2.2 \ |
119 | crate://crates.io/typeable/0.1.2 \ | 118 | crate://crates.io/typeable/0.1.2 \ |
120 | crate://crates.io/unicase/1.4.0 \ | 119 | crate://crates.io/unicase/1.4.0 \ |
121 | crate://crates.io/unicode-bidi/0.2.5 \ | 120 | crate://crates.io/unicode-bidi/0.2.5 \ |
@@ -127,17 +126,17 @@ crate://crates.io/untrusted/0.3.2 \ | |||
127 | crate://crates.io/url/1.4.0 \ | 126 | crate://crates.io/url/1.4.0 \ |
128 | crate://crates.io/user32-sys/0.2.0 \ | 127 | crate://crates.io/user32-sys/0.2.0 \ |
129 | crate://crates.io/utf-8/0.7.0 \ | 128 | crate://crates.io/utf-8/0.7.0 \ |
130 | crate://crates.io/utf8-ranges/0.1.3 \ | ||
131 | crate://crates.io/utf8-ranges/1.0.0 \ | 129 | crate://crates.io/utf8-ranges/1.0.0 \ |
132 | crate://crates.io/uuid/0.4.0 \ | 130 | crate://crates.io/uuid/0.5.0 \ |
133 | crate://crates.io/void/1.0.2 \ | 131 | crate://crates.io/void/1.0.2 \ |
134 | crate://crates.io/winapi/0.2.8 \ | 132 | crate://crates.io/winapi/0.2.8 \ |
135 | crate://crates.io/winapi-build/0.1.1 \ | 133 | crate://crates.io/winapi-build/0.1.1 \ |
134 | crate://crates.io/xattr/0.1.11 \ | ||
136 | git://github.com/advancedtelematic/rvi_sota_client \ | 135 | git://github.com/advancedtelematic/rvi_sota_client \ |
137 | " | 136 | " |
138 | 137 | ||
139 | SRC_URI[index.md5sum] = "79f10f436dbf26737cc80445746f16b4" | 138 | SRC_URI[index.md5sum] = "6a635e8a081b4d4ba4cebffd721c2d7d" |
140 | SRC_URI[index.sha256sum] = "86114b93f1f51aaf0aec3af0751d214b351f4ff9839ba031315c1b19dcbb1913" | 139 | SRC_URI[index.sha256sum] = "1913c41d4b8de89a931b6f9e418f83e70a083e12e6c247e8510ee932571ebae2" |
141 | 140 | ||
142 | SYSTEMD_SERVICE_${PN} = "sota_client.service sota_client_autoprovision.service" | 141 | SYSTEMD_SERVICE_${PN} = "sota_client.service sota_client_autoprovision.service" |
143 | 142 | ||
@@ -151,6 +150,7 @@ RDEPENDS_${PN} = " libcrypto \ | |||
151 | python \ | 150 | python \ |
152 | python-canonicaljson \ | 151 | python-canonicaljson \ |
153 | python-json \ | 152 | python-json \ |
153 | python-petname \ | ||
154 | " | 154 | " |
155 | 155 | ||
156 | export SOTA_PACKED_CREDENTIALS | 156 | export SOTA_PACKED_CREDENTIALS |
@@ -166,7 +166,6 @@ do_install() { | |||
166 | install -m 0755 target/${TARGET_SYS}/release/sota_client ${D}${bindir} | 166 | install -m 0755 target/${TARGET_SYS}/release/sota_client ${D}${bindir} |
167 | install -m 0755 ${S}/run/sota_sysinfo.sh ${D}${bindir} | 167 | install -m 0755 ${S}/run/sota_sysinfo.sh ${D}${bindir} |
168 | ln -fs ${bindir}/sota_sysinfo.sh ${D}${bindir}/system_info.sh # For compatibilty with old sota.toml files | 168 | ln -fs ${bindir}/sota_sysinfo.sh ${D}${bindir}/system_info.sh # For compatibilty with old sota.toml files |
169 | install -m 0755 ${S}/run/sota_ostree.sh ${D}${bindir} | ||
170 | install -m 0755 ${S}/run/sota_prov.sh ${D}${bindir} | 169 | install -m 0755 ${S}/run/sota_prov.sh ${D}${bindir} |
171 | install -m 0755 ${S}/run/canonical_json.py ${D}${bindir} | 170 | install -m 0755 ${S}/run/canonical_json.py ${D}${bindir} |
172 | 171 | ||
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 @@ | |||
1 | DESCRIPTION = "python-petname recipe" | ||
2 | |||
3 | LICENSE = "Apache-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | ||
5 | |||
6 | SRCREV = "d0b767cdb1567defb104f29c3fd022239a7f231e" | ||
7 | SRC_URI = "git://github.com/dustinkirkland/python-petname.git" | ||
8 | S = "${WORKDIR}/git" | ||
9 | |||
10 | PV = "2.2" | ||
11 | inherit setuptools | ||
12 | RDEPENDS_${PN} = " python-setuptools \ | ||
13 | python-argparse \ | ||
14 | " | ||
15 | |||