diff options
author | cajun-rat <p@beta16.co.uk> | 2017-06-28 12:56:48 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-28 12:56:48 +0200 |
commit | 964c0354e6bd0c562976b61363b7d8ea6681d810 (patch) | |
tree | c754139a29af196cac355903020e4a315f6b0276 | |
parent | 83af625b2bee24827f4c810b9c8d6a5f413f0ea0 (diff) | |
parent | dc234532add69842295902d35981dba886468da0 (diff) | |
download | meta-updater-964c0354e6bd0c562976b61363b7d8ea6681d810.tar.gz |
Merge pull request #86 from advancedtelematic/feat/pro-3320
Aktualizr updates, including sync()
-rw-r--r-- | classes/image_types_ostree.bbclass | 2 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 9 | ||||
-rw-r--r-- | recipes-sota/aktualizr/files/aktualizr-autoprovision.service | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass index 2a74e51..72d7df5 100644 --- a/classes/image_types_ostree.bbclass +++ b/classes/image_types_ostree.bbclass | |||
@@ -203,7 +203,7 @@ IMAGE_CMD_ostree () { | |||
203 | IMAGE_TYPEDEP_ostreepush = "ostree" | 203 | IMAGE_TYPEDEP_ostreepush = "ostree" |
204 | IMAGE_DEPENDS_ostreepush = "sota-tools-native:do_populate_sysroot" | 204 | IMAGE_DEPENDS_ostreepush = "sota-tools-native:do_populate_sysroot" |
205 | IMAGE_CMD_ostreepush () { | 205 | IMAGE_CMD_ostreepush () { |
206 | if [ ${OSTREE_PUSH_CREDENTIALS} ]; then | 206 | if [ -n "${OSTREE_PUSH_CREDENTIALS}" ]; then |
207 | garage-push --repo=${OSTREE_REPO} \ | 207 | garage-push --repo=${OSTREE_REPO} \ |
208 | --ref=${OSTREE_BRANCHNAME} \ | 208 | --ref=${OSTREE_BRANCHNAME} \ |
209 | --credentials=${OSTREE_PUSH_CREDENTIALS} \ | 209 | --credentials=${OSTREE_PUSH_CREDENTIALS} \ |
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 62ee9b0..39a8ac8 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -12,7 +12,7 @@ SRC_URI = " \ | |||
12 | file://aktualizr-autoprovision.service \ | 12 | file://aktualizr-autoprovision.service \ |
13 | file://sota_autoprov.toml \ | 13 | file://sota_autoprov.toml \ |
14 | " | 14 | " |
15 | SRCREV = "2e897310c611e2da46f8af888bb62c09b2a2906a" | 15 | SRCREV = "33614fb9fc8f6c9ab5fae20c16d1dca0a330b07f" |
16 | PV = "1.0+git${SRCPV}" | 16 | PV = "1.0+git${SRCPV}" |
17 | 17 | ||
18 | S = "${WORKDIR}/git" | 18 | S = "${WORKDIR}/git" |
@@ -23,13 +23,14 @@ inherit cmake systemd | |||
23 | EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_OSTREE=ON -DAKTUALIZR_VERSION=${PV}" | 23 | EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTS=OFF -DBUILD_OSTREE=ON -DAKTUALIZR_VERSION=${PV}" |
24 | 24 | ||
25 | export SOTA_AUTOPROVISION_CREDENTIALS | 25 | export SOTA_AUTOPROVISION_CREDENTIALS |
26 | export SOTA_PACKED_CREDENTIALS | ||
26 | 27 | ||
27 | do_install_append() { | 28 | do_install_append() { |
28 | if [ -n "${SOTA_AUTOPROVISION_CREDENTIALS}" -o -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 29 | if [ -n "${SOTA_AUTOPROVISION_CREDENTIALS}" -o -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
29 | install -d ${D}/${systemd_unitdir}/system | 30 | install -d ${D}/${systemd_unitdir}/system |
30 | install -m 0644 ${WORKDIR}/aktualizr-autoprovision.service ${D}/${systemd_unitdir}/system/aktualizr.service | 31 | install -m 0644 ${WORKDIR}/aktualizr-autoprovision.service ${D}/${systemd_unitdir}/system/aktualizr.service |
31 | install -d ${D}/var/sota | 32 | install -d ${D}/usr/lib/sota |
32 | install -m "0644" ${WORKDIR}/sota_autoprov.toml ${D}/var/sota/sota.toml | 33 | install -m "0644" ${WORKDIR}/sota_autoprov.toml ${D}/usr/lib/sota/sota.toml |
33 | else | 34 | else |
34 | install -d ${D}/${systemd_unitdir}/system | 35 | install -d ${D}/${systemd_unitdir}/system |
35 | install -m 0644 ${WORKDIR}/aktualizr-manual-provision.service ${D}/${systemd_unitdir}/system/aktualizr.service | 36 | install -m 0644 ${WORKDIR}/aktualizr-manual-provision.service ${D}/${systemd_unitdir}/system/aktualizr.service |
@@ -39,5 +40,5 @@ do_install_append() { | |||
39 | FILES_${PN} = " \ | 40 | FILES_${PN} = " \ |
40 | ${bindir}/aktualizr \ | 41 | ${bindir}/aktualizr \ |
41 | ${systemd_unitdir}/system/aktualizr.service \ | 42 | ${systemd_unitdir}/system/aktualizr.service \ |
42 | /var/sota/sota.toml \ | 43 | /usr/lib/sota/sota.toml \ |
43 | " | 44 | " |
diff --git a/recipes-sota/aktualizr/files/aktualizr-autoprovision.service b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service index a5b92e3..fd0ab09 100644 --- a/recipes-sota/aktualizr/files/aktualizr-autoprovision.service +++ b/recipes-sota/aktualizr/files/aktualizr-autoprovision.service | |||
@@ -8,7 +8,7 @@ Requires=network-online.target | |||
8 | RestartSec=10 | 8 | RestartSec=10 |
9 | Restart=always | 9 | Restart=always |
10 | EnvironmentFile=/var/sota/sota_provisioning_url.env | 10 | EnvironmentFile=/var/sota/sota_provisioning_url.env |
11 | ExecStart=/bin/sh -c "/usr/bin/aktualizr --disable-keyid-validation --tls-server ${SOTA_GATEWAY_URI} --primary-ecu-hardware-id `cat /etc/hostname` --config /var/sota/sota.toml" | 11 | ExecStart=/usr/bin/aktualizr --disable-keyid-validation --tls-server ${SOTA_GATEWAY_URI} --config /usr/lib/sota/sota.toml |
12 | 12 | ||
13 | [Install] | 13 | [Install] |
14 | WantedBy=multi-user.target | 14 | WantedBy=multi-user.target |