diff options
author | Anton Gerasimov <anton.gerasimov@here.com> | 2018-06-01 13:03:21 +0200 |
---|---|---|
committer | Anton Gerasimov <anton.gerasimov@here.com> | 2018-06-15 12:00:58 +0200 |
commit | 13ec1f013c576a34df86e95a48877148f11343db (patch) | |
tree | be90a184da9c690509bab17fd6298ce105a2f3bb /recipes-sota | |
parent | 07e6eb6aedb752e9f0bf856b2b47d8c9518b8900 (diff) | |
download | meta-updater-13ec1f013c576a34df86e95a48877148f11343db.tar.gz |
Add support for rollback on Raspberry Pi
Diffstat (limited to 'recipes-sota')
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb | 23 | ||||
-rwxr-xr-x | recipes-sota/aktualizr/aktualizr_git.bb | 6 | ||||
-rw-r--r-- | recipes-sota/aktualizr/files/aktualizr.service | 4 |
3 files changed, 29 insertions, 4 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb b/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb new file mode 100644 index 0000000..c9753e4 --- /dev/null +++ b/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb | |||
@@ -0,0 +1,23 @@ | |||
1 | SUMMARY = "Aktualizr configuration snippet to enable uboot bootcount function" | ||
2 | HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" | ||
3 | SECTION = "base" | ||
4 | LICENSE = "MPL-2.0" | ||
5 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=9741c346eef56131163e13b9db1241b3" | ||
6 | DEPENDS = "aktualizr-native" | ||
7 | RDEPENDS_${PN} = "aktualizr" | ||
8 | |||
9 | SRC_URI = " \ | ||
10 | file://LICENSE \ | ||
11 | " | ||
12 | |||
13 | do_install() { | ||
14 | install -m 0700 -d ${D}${libdir}/sota/conf.d | ||
15 | install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_uboot_env.toml ${D}${libdir}/sota/conf.d/30-rollback.toml | ||
16 | } | ||
17 | |||
18 | FILES_${PN} = " \ | ||
19 | ${libdir}/sota/conf.d \ | ||
20 | ${libdir}/sota/conf.d/30-rollback.toml \ | ||
21 | " | ||
22 | |||
23 | # vim:set ts=4 sw=4 sts=4 expandtab: | ||
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 8dc4b31..9ca0815 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -12,6 +12,8 @@ DEPENDS_append_class-native = "glib-2.0-native " | |||
12 | RDEPENDS_${PN}_class-target = "lshw " | 12 | RDEPENDS_${PN}_class-target = "lshw " |
13 | RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'serialcan', ' slcand-start', '', d)} " | 13 | RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'serialcan', ' slcand-start', '', d)} " |
14 | RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' softhsm softhsm-testtoken', '', d)}" | 14 | RDEPENDS_${PN}_append_class-target = "${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', ' softhsm softhsm-testtoken', '', d)}" |
15 | RDEPENDS_${PN}_append_class-target = " ${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot', 'u-boot-fw-utils', '')}" | ||
16 | RDEPENDS_${PN}_append_class-target = " ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'ubootenv', ' aktualizr-uboot-env-rollback', '', d)} " | ||
15 | 17 | ||
16 | PV = "1.0+git${SRCPV}" | 18 | PV = "1.0+git${SRCPV}" |
17 | PR = "7" | 19 | PR = "7" |
@@ -23,7 +25,7 @@ SRC_URI = " \ | |||
23 | file://aktualizr-secondary.socket \ | 25 | file://aktualizr-secondary.socket \ |
24 | file://aktualizr-serialcan.service \ | 26 | file://aktualizr-serialcan.service \ |
25 | " | 27 | " |
26 | SRCREV = "114dc6c519ca9a605d73ad292821348607d0fa12" | 28 | SRCREV = "9f538a8a411ca917184fe11a6cf92e5ebf9efc61" |
27 | BRANCH ?= "master" | 29 | BRANCH ?= "master" |
28 | 30 | ||
29 | S = "${WORKDIR}/git" | 31 | S = "${WORKDIR}/git" |
@@ -63,6 +65,7 @@ do_install_append () { | |||
63 | install -m 0644 ${S}/config/sota_implicit_prov.toml ${D}/${libdir}/sota/sota_implicit_prov.toml | 65 | install -m 0644 ${S}/config/sota_implicit_prov.toml ${D}/${libdir}/sota/sota_implicit_prov.toml |
64 | install -m 0644 ${S}/config/sota_implicit_prov_ca.toml ${D}/${libdir}/sota/sota_implicit_prov_ca.toml | 66 | install -m 0644 ${S}/config/sota_implicit_prov_ca.toml ${D}/${libdir}/sota/sota_implicit_prov_ca.toml |
65 | install -m 0644 ${S}/config/sota_secondary.toml ${D}/${libdir}/sota/sota_secondary.toml | 67 | install -m 0644 ${S}/config/sota_secondary.toml ${D}/${libdir}/sota/sota_secondary.toml |
68 | install -m 0644 ${S}/config/sota_uboot_env.toml ${D}/${libdir}/sota/sota_uboot_env.toml | ||
66 | install -d ${D}${systemd_unitdir}/system | 69 | install -d ${D}${systemd_unitdir}/system |
67 | install -m 0644 ${WORKDIR}/aktualizr-secondary.socket ${D}${systemd_unitdir}/system/aktualizr-secondary.socket | 70 | install -m 0644 ${WORKDIR}/aktualizr-secondary.socket ${D}${systemd_unitdir}/system/aktualizr-secondary.socket |
68 | install -m 0644 ${WORKDIR}/aktualizr-secondary.service ${D}${systemd_unitdir}/system/aktualizr-secondary.service | 71 | install -m 0644 ${WORKDIR}/aktualizr-secondary.service ${D}${systemd_unitdir}/system/aktualizr-secondary.service |
@@ -109,6 +112,7 @@ FILES_${PN}-host-tools = " \ | |||
109 | ${libdir}/sota/sota_hsm_prov.toml \ | 112 | ${libdir}/sota/sota_hsm_prov.toml \ |
110 | ${libdir}/sota/sota_implicit_prov.toml \ | 113 | ${libdir}/sota/sota_implicit_prov.toml \ |
111 | ${libdir}/sota/sota_implicit_prov_ca.toml \ | 114 | ${libdir}/sota/sota_implicit_prov_ca.toml \ |
115 | ${libdir}/sota/sota_uboot_env.toml \ | ||
112 | " | 116 | " |
113 | 117 | ||
114 | FILES_${PN}-secondary = " \ | 118 | FILES_${PN}-secondary = " \ |
diff --git a/recipes-sota/aktualizr/files/aktualizr.service b/recipes-sota/aktualizr/files/aktualizr.service index 1c2e1df..6de4474 100644 --- a/recipes-sota/aktualizr/files/aktualizr.service +++ b/recipes-sota/aktualizr/files/aktualizr.service | |||
@@ -1,8 +1,6 @@ | |||
1 | [Unit] | 1 | [Unit] |
2 | Description=Aktualizr SOTA Client | 2 | Description=Aktualizr SOTA Client |
3 | Wants=network-online.target | 3 | After=network.target |
4 | After=network.target network-online.target | ||
5 | Requires=network-online.target | ||
6 | 4 | ||
7 | [Service] | 5 | [Service] |
8 | RestartSec=10 | 6 | RestartSec=10 |