diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2017-07-19 14:05:48 +0200 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2017-08-07 17:01:39 +0200 |
commit | 53307024e1845c4717be7eb8b8735e493ec4535d (patch) | |
tree | e1baf988680d73c92635756b2c35f8b1a78e3dd3 /recipes-sota | |
parent | 34d5f757a86a7e8e1db3e19f2fb33e90e3f33584 (diff) | |
download | meta-updater-53307024e1845c4717be7eb8b8735e493ec4535d.tar.gz |
Call garage-push directly with zip file instead of sending unzipped contents.
Warn if older credential environment variables are set. They are now
ignored since the credentials aren't unpacked during building.
Diffstat (limited to 'recipes-sota')
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 6 | ||||
-rw-r--r-- | recipes-sota/aktualizr/files/aktualizr-autoprovision.service | 3 | ||||
-rw-r--r-- | recipes-sota/aktualizr/files/sota_autoprov.toml | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 359c9fb..8bc580d 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -13,8 +13,9 @@ SRC_URI = " \ | |||
13 | file://aktualizr-autoprovision.service \ | 13 | file://aktualizr-autoprovision.service \ |
14 | file://sota_autoprov.toml \ | 14 | file://sota_autoprov.toml \ |
15 | " | 15 | " |
16 | SRCREV = "c24f1fc9b600113cf9f2d3d7215e406cbbb70ac4" | 16 | SRCREV = "1004efa3f86cef90c012b34620992b5762b741e3" |
17 | PV = "1.0+git${SRCPV}" | 17 | PV = "1.0+git${SRCPV}" |
18 | PR = "6" | ||
18 | 19 | ||
19 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
20 | SYSTEMD_SERVICE_${PN} = "aktualizr.service" | 21 | SYSTEMD_SERVICE_${PN} = "aktualizr.service" |
@@ -23,11 +24,10 @@ inherit cmake systemd | |||
23 | 24 | ||
24 | EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_OSTREE=ON -DAKTUALIZR_VERSION=${PV}" | 25 | EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_OSTREE=ON -DAKTUALIZR_VERSION=${PV}" |
25 | 26 | ||
26 | export SOTA_AUTOPROVISION_CREDENTIALS | ||
27 | export SOTA_PACKED_CREDENTIALS | 27 | export SOTA_PACKED_CREDENTIALS |
28 | 28 | ||
29 | do_install_append() { | 29 | do_install_append() { |
30 | if [ -n "${SOTA_AUTOPROVISION_CREDENTIALS}" -o -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 30 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
31 | install -d ${D}/${systemd_unitdir}/system | 31 | install -d ${D}/${systemd_unitdir}/system |
32 | install -m 0644 ${WORKDIR}/aktualizr-autoprovision.service ${D}/${systemd_unitdir}/system/aktualizr.service | 32 | install -m 0644 ${WORKDIR}/aktualizr-autoprovision.service ${D}/${systemd_unitdir}/system/aktualizr.service |
33 | install -d ${D}/usr/lib/sota | 33 | install -d ${D}/usr/lib/sota |
diff --git a/recipes-sota/aktualizr/files/aktualizr-autoprovision.service b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service index fd0ab09..4a595f0 100644 --- a/recipes-sota/aktualizr/files/aktualizr-autoprovision.service +++ b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service | |||
@@ -7,8 +7,7 @@ Requires=network-online.target | |||
7 | [Service] | 7 | [Service] |
8 | RestartSec=10 | 8 | RestartSec=10 |
9 | Restart=always | 9 | Restart=always |
10 | EnvironmentFile=/var/sota/sota_provisioning_url.env | 10 | ExecStart=/usr/bin/aktualizr --disable-keyid-validation --config /usr/lib/sota/sota.toml |
11 | ExecStart=/usr/bin/aktualizr --disable-keyid-validation --tls-server ${SOTA_GATEWAY_URI} --config /usr/lib/sota/sota.toml | ||
12 | 11 | ||
13 | [Install] | 12 | [Install] |
14 | WantedBy=multi-user.target | 13 | WantedBy=multi-user.target |
diff --git a/recipes-sota/aktualizr/files/sota_autoprov.toml b/recipes-sota/aktualizr/files/sota_autoprov.toml index 8799553..9d4ce3b 100644 --- a/recipes-sota/aktualizr/files/sota_autoprov.toml +++ b/recipes-sota/aktualizr/files/sota_autoprov.toml | |||
@@ -1,9 +1,9 @@ | |||
1 | [device] | 1 | [device] |
2 | packages_dir = "/tmp/packages_dir" | 2 | packages_dir = "/tmp/packages_dir" |
3 | certificates_directory = "/var/sota" | ||
4 | system_info = "system_info.sh" | 3 | system_info = "system_info.sh" |
5 | 4 | ||
6 | [tls] | 5 | [tls] |
6 | certificates_directory = "/var/sota/" | ||
7 | ca_file = "root.crt" | 7 | ca_file = "root.crt" |
8 | client_certificate = "client.pem" | 8 | client_certificate = "client.pem" |
9 | pkey_file = "pkey.pem" | 9 | pkey_file = "pkey.pem" |
@@ -14,5 +14,5 @@ private_key_path = "ecukey.der" | |||
14 | public_key_path = "ecukey.pub" | 14 | public_key_path = "ecukey.pub" |
15 | 15 | ||
16 | [provision] | 16 | [provision] |
17 | p12_path = "sota_provisioning_credentials.p12" | 17 | provision_path = "/var/sota/sota_provisioning_credentials.zip" |
18 | 18 | ||