diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2019-06-13 16:59:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-13 16:59:21 +0200 |
commit | 1c049cbaec927971b0425e608b68551a4d2b898b (patch) | |
tree | 1b549011977622f2883bd13ac2c299f29609838c /recipes-sota | |
parent | 9725c55078e6216437904aa63d5bb5c632f92302 (diff) | |
parent | 249254d0100eb19a2be5929cc14ee9f64bf0dd7c (diff) | |
download | meta-updater-1c049cbaec927971b0425e608b68551a4d2b898b.tar.gz |
Merge pull request #526 from advancedtelematic/refactor/thud/renaming-secondaries-etc
Refactor/thud/renaming secondaries etc
Diffstat (limited to 'recipes-sota')
13 files changed, 123 insertions, 97 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb deleted file mode 100644 index 414cb5e..0000000 --- a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | SUMMARY = "Aktualizr configuration for implicit provisioning with CA" | ||
2 | DESCRIPTION = "Configuration for implicitly provisioning Aktualizr using externally provided or generated CA" | ||
3 | |||
4 | HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" | ||
5 | SECTION = "base" | ||
6 | LICENSE = "MPL-2.0" | ||
7 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" | ||
8 | |||
9 | inherit allarch | ||
10 | |||
11 | DEPENDS = "aktualizr aktualizr-native openssl-native" | ||
12 | RDEPENDS_${PN}_append = "${@' aktualizr-ca-implicit-prov-creds' if d.getVar('SOTA_DEPLOY_CREDENTIALS') == '1' else ''}" | ||
13 | |||
14 | PV = "1.0" | ||
15 | PR = "1" | ||
16 | |||
17 | require credentials.inc | ||
18 | |||
19 | do_install() { | ||
20 | install -m 0700 -d ${D}${libdir}/sota/conf.d | ||
21 | |||
22 | install -m 0644 ${STAGING_DIR_HOST}${libdir}/sota/sota_implicit_prov_ca.toml \ | ||
23 | ${D}${libdir}/sota/conf.d/20-sota_implicit_prov_ca.toml | ||
24 | } | ||
25 | |||
26 | FILES_${PN} = " \ | ||
27 | ${libdir}/sota/conf.d/20-sota_implicit_prov_ca.toml \ | ||
28 | " | ||
29 | |||
30 | # vim:set ts=4 sw=4 sts=4 expandtab: | ||
diff --git a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov-creds.bb b/recipes-sota/aktualizr/aktualizr-device-prov-creds.bb index da17d77..6e02a50 100644 --- a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov-creds.bb +++ b/recipes-sota/aktualizr/aktualizr-device-prov-creds.bb | |||
@@ -1,4 +1,5 @@ | |||
1 | SUMMARY = "Credentials for implicit provisioning with CA certificate" | 1 | SUMMARY = "Credentials for device provisioning with fleet CA certificate" |
2 | HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" | ||
2 | SECTION = "base" | 3 | SECTION = "base" |
3 | LICENSE = "MPL-2.0" | 4 | LICENSE = "MPL-2.0" |
4 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" | 5 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" |
@@ -13,8 +14,8 @@ DEPENDS = "aktualizr aktualizr-native" | |||
13 | ALLOW_EMPTY_${PN} = "1" | 14 | ALLOW_EMPTY_${PN} = "1" |
14 | 15 | ||
15 | SRC_URI = " \ | 16 | SRC_URI = " \ |
16 | file://ca.cnf \ | 17 | file://ca.cnf \ |
17 | " | 18 | " |
18 | 19 | ||
19 | require credentials.inc | 20 | require credentials.inc |
20 | 21 | ||
@@ -39,7 +40,7 @@ do_install() { | |||
39 | fi | 40 | fi |
40 | 41 | ||
41 | if [ -z ${SOTA_CAKEY_PATH} ]; then | 42 | if [ -z ${SOTA_CAKEY_PATH} ]; then |
42 | bbfatal "SOTA_CAKEY_PATH should be set when using implicit provisioning" | 43 | bbfatal "SOTA_CAKEY_PATH should be set when using device credential provisioning" |
43 | fi | 44 | fi |
44 | 45 | ||
45 | install -m 0700 -d ${D}${localstatedir}/sota | 46 | install -m 0700 -d ${D}${localstatedir}/sota |
@@ -49,9 +50,11 @@ do_install() { | |||
49 | --root-ca \ | 50 | --root-ca \ |
50 | --server-url \ | 51 | --server-url \ |
51 | --local ${D} \ | 52 | --local ${D} \ |
52 | --config ${STAGING_DIR_HOST}${libdir}/sota/sota_implicit_prov_ca.toml | 53 | --config ${STAGING_DIR_HOST}${libdir}/sota/sota-device-cred.toml |
53 | fi | 54 | fi |
54 | } | 55 | } |
55 | 56 | ||
56 | FILES_${PN} = " \ | 57 | FILES_${PN} = " \ |
57 | ${localstatedir}/sota/*" | 58 | ${localstatedir}/sota/*" |
59 | |||
60 | # vim:set ts=4 sw=4 sts=4 expandtab: | ||
diff --git a/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb b/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb new file mode 100644 index 0000000..c3cd593 --- /dev/null +++ b/recipes-sota/aktualizr/aktualizr-device-prov-hsm.bb | |||
@@ -0,0 +1,30 @@ | |||
1 | SUMMARY = "Aktualizr configuration for device credential provisioning with HSM support" | ||
2 | DESCRIPTION = "Configuration for provisioning Aktualizr with device credentials using externally provided or generated CA with HSM support" | ||
3 | HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" | ||
4 | SECTION = "base" | ||
5 | LICENSE = "MPL-2.0" | ||
6 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" | ||
7 | |||
8 | inherit allarch | ||
9 | |||
10 | DEPENDS = "aktualizr aktualizr-native" | ||
11 | RDEPENDS_${PN}_append = "${@' aktualizr-device-prov-creds softhsm-testtoken' if d.getVar('SOTA_DEPLOY_CREDENTIALS') == '1' else ''}" | ||
12 | |||
13 | SRC_URI = "" | ||
14 | PV = "1.0" | ||
15 | PR = "6" | ||
16 | |||
17 | require credentials.inc | ||
18 | |||
19 | do_install() { | ||
20 | install -m 0700 -d ${D}${libdir}/sota/conf.d | ||
21 | install -m 0644 ${STAGING_DIR_HOST}${libdir}/sota/sota-device-cred-hsm.toml \ | ||
22 | ${D}${libdir}/sota/conf.d/20-sota-device-cred-hsm.toml | ||
23 | } | ||
24 | |||
25 | FILES_${PN} = " \ | ||
26 | ${libdir}/sota/conf.d \ | ||
27 | ${libdir}/sota/conf.d/20-sota-device-cred-hsm.toml \ | ||
28 | " | ||
29 | |||
30 | # vim:set ts=4 sw=4 sts=4 expandtab: | ||
diff --git a/recipes-sota/aktualizr/aktualizr-device-prov.bb b/recipes-sota/aktualizr/aktualizr-device-prov.bb new file mode 100644 index 0000000..d579532 --- /dev/null +++ b/recipes-sota/aktualizr/aktualizr-device-prov.bb | |||
@@ -0,0 +1,29 @@ | |||
1 | SUMMARY = "Aktualizr configuration for device credential provisioning" | ||
2 | DESCRIPTION = "Configuration for provisioning Aktualizr with device credentials using externally provided or generated CA" | ||
3 | HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" | ||
4 | SECTION = "base" | ||
5 | LICENSE = "MPL-2.0" | ||
6 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" | ||
7 | |||
8 | inherit allarch | ||
9 | |||
10 | DEPENDS = "aktualizr aktualizr-native openssl-native" | ||
11 | RDEPENDS_${PN}_append = "${@' aktualizr-device-prov-creds' if d.getVar('SOTA_DEPLOY_CREDENTIALS') == '1' else ''}" | ||
12 | |||
13 | PV = "1.0" | ||
14 | PR = "1" | ||
15 | |||
16 | require credentials.inc | ||
17 | |||
18 | do_install() { | ||
19 | install -m 0700 -d ${D}${libdir}/sota/conf.d | ||
20 | install -m 0644 ${STAGING_DIR_HOST}${libdir}/sota/sota-device-cred.toml \ | ||
21 | ${D}${libdir}/sota/conf.d/20-sota-device-cred.toml | ||
22 | } | ||
23 | |||
24 | FILES_${PN} = " \ | ||
25 | ${libdir}/sota/conf.d \ | ||
26 | ${libdir}/sota/conf.d/20-sota-device-cred.toml \ | ||
27 | " | ||
28 | |||
29 | # vim:set ts=4 sw=4 sts=4 expandtab: | ||
diff --git a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb deleted file mode 100644 index 77c6720..0000000 --- a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | SUMMARY = "Aktualizr configuration with HSM support" | ||
2 | DESCRIPTION = "Configuration for HSM provisioning with Aktualizr, the SOTA Client application written in C++" | ||
3 | HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" | ||
4 | SECTION = "base" | ||
5 | LICENSE = "MPL-2.0" | ||
6 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" | ||
7 | |||
8 | inherit allarch | ||
9 | |||
10 | DEPENDS = "aktualizr aktualizr-native" | ||
11 | RDEPENDS_${PN}_append = "${@' aktualizr-ca-implicit-prov-creds softhsm-testtoken' if d.getVar('SOTA_DEPLOY_CREDENTIALS') == '1' else ''}" | ||
12 | |||
13 | SRC_URI = "" | ||
14 | PV = "1.0" | ||
15 | PR = "6" | ||
16 | |||
17 | require credentials.inc | ||
18 | |||
19 | do_install() { | ||
20 | install -m 0700 -d ${D}${libdir}/sota/conf.d | ||
21 | install -m 0644 ${STAGING_DIR_HOST}${libdir}/sota/sota_hsm_prov.toml \ | ||
22 | ${D}${libdir}/sota/conf.d/20-sota_hsm_prov.toml | ||
23 | } | ||
24 | |||
25 | FILES_${PN} = " \ | ||
26 | ${libdir}/sota/conf.d \ | ||
27 | ${libdir}/sota/conf.d/20-sota_hsm_prov.toml \ | ||
28 | " | ||
29 | |||
30 | # vim:set ts=4 sw=4 sts=4 expandtab: | ||
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov-creds.bb b/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb index 6b2dd27..dbb5fde 100644 --- a/recipes-sota/aktualizr/aktualizr-auto-prov-creds.bb +++ b/recipes-sota/aktualizr/aktualizr-shared-prov-creds.bb | |||
@@ -1,4 +1,5 @@ | |||
1 | SUMMARY = "Credentials for autoprovisioning scenario" | 1 | SUMMARY = "Credentials for shared provisioning" |
2 | HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" | ||
2 | SECTION = "base" | 3 | SECTION = "base" |
3 | LICENSE = "MPL-2.0" | 4 | LICENSE = "MPL-2.0" |
4 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" | 5 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" |
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-shared-prov.bb index 4b68491..d3d6f16 100644 --- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-shared-prov.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | SUMMARY = "Aktualizr configuration for autoprovisioning" | 1 | SUMMARY = "Aktualizr configuration for shared credential provisioning" |
2 | DESCRIPTION = "Configuration for automatically provisioning Aktualizr, the SOTA Client application written in C++" | 2 | DESCRIPTION = "Configuration for provisioning Aktualizr with shared credentials" |
3 | HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" | 3 | HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" |
4 | SECTION = "base" | 4 | SECTION = "base" |
5 | LICENSE = "MPL-2.0" | 5 | LICENSE = "MPL-2.0" |
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 | |||
8 | inherit allarch | 8 | inherit allarch |
9 | 9 | ||
10 | DEPENDS = "aktualizr-native zip-native" | 10 | DEPENDS = "aktualizr-native zip-native" |
11 | RDEPENDS_${PN}_append = "${@' aktualizr-auto-prov-creds' if d.getVar('SOTA_DEPLOY_CREDENTIALS') == '1' else ''}" | 11 | RDEPENDS_${PN}_append = "${@' aktualizr-shared-prov-creds' if d.getVar('SOTA_DEPLOY_CREDENTIALS') == '1' else ''}" |
12 | PV = "1.0" | 12 | PV = "1.0" |
13 | PR = "6" | 13 | PR = "6" |
14 | 14 | ||
@@ -31,15 +31,13 @@ do_install() { | |||
31 | fi | 31 | fi |
32 | 32 | ||
33 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 33 | install -m 0700 -d ${D}${libdir}/sota/conf.d |
34 | aktualizr_toml=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-network', 'sota_autoprov_primary.toml', 'sota_autoprov.toml', d)} | 34 | install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota-shared-cred.toml \ |
35 | 35 | ${D}${libdir}/sota/conf.d/20-sota-shared-cred.toml | |
36 | install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/${aktualizr_toml} \ | ||
37 | ${D}${libdir}/sota/conf.d/20-${aktualizr_toml} | ||
38 | } | 36 | } |
39 | 37 | ||
40 | FILES_${PN} = " \ | 38 | FILES_${PN} = " \ |
41 | ${libdir}/sota/conf.d \ | 39 | ${libdir}/sota/conf.d \ |
42 | ${libdir}/sota/conf.d/20-${aktualizr_toml} \ | 40 | ${libdir}/sota/conf.d/20-sota-shared-cred.toml \ |
43 | " | 41 | " |
44 | 42 | ||
45 | # vim:set ts=4 sw=4 sts=4 expandtab: | 43 | # vim:set ts=4 sw=4 sts=4 expandtab: |
diff --git a/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb b/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb index d962876..860f225 100644 --- a/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb +++ b/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb | |||
@@ -13,7 +13,7 @@ SRC_URI = "" | |||
13 | 13 | ||
14 | do_install() { | 14 | do_install() { |
15 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 15 | install -m 0700 -d ${D}${libdir}/sota/conf.d |
16 | install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_uboot_env.toml ${D}${libdir}/sota/conf.d/30-rollback.toml | 16 | install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota-uboot-env.toml ${D}${libdir}/sota/conf.d/30-rollback.toml |
17 | } | 17 | } |
18 | 18 | ||
19 | FILES_${PN} = " \ | 19 | FILES_${PN} = " \ |
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 903f2de..75d5bd9 100755..100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -15,24 +15,23 @@ RDEPENDS_${PN}-ptest += "bash cmake curl python3-misc python3-modules openssl-bi | |||
15 | PV = "1.0+git${SRCPV}" | 15 | PV = "1.0+git${SRCPV}" |
16 | PR = "7" | 16 | PR = "7" |
17 | 17 | ||
18 | GARAGE_SIGN_PV = "0.6.0-18-g5b8b259" | 18 | GARAGE_SIGN_PV = "0.7.0-3-gf5ba640" |
19 | 19 | ||
20 | SRC_URI = " \ | 20 | SRC_URI = " \ |
21 | gitsm://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \ | 21 | gitsm://github.com/advancedtelematic/aktualizr;branch=${BRANCH} \ |
22 | file://run-ptest \ | 22 | file://run-ptest \ |
23 | file://aktualizr.service \ | 23 | file://aktualizr.service \ |
24 | file://aktualizr-secondary.service \ | 24 | file://aktualizr-secondary.service \ |
25 | file://aktualizr-secondary.socket \ | ||
26 | file://aktualizr-serialcan.service \ | 25 | file://aktualizr-serialcan.service \ |
27 | file://10-resource-control.conf \ | 26 | file://10-resource-control.conf \ |
28 | ${@ d.expand("https://ats-tuf-cli-releases.s3-eu-central-1.amazonaws.com/cli-${GARAGE_SIGN_PV}.tgz;unpack=0") if d.getVar('GARAGE_SIGN_AUTOVERSION') != '1' else ''} \ | 27 | ${@ d.expand("https://ats-tuf-cli-releases.s3-eu-central-1.amazonaws.com/cli-${GARAGE_SIGN_PV}.tgz;unpack=0") if d.getVar('GARAGE_SIGN_AUTOVERSION') != '1' else ''} \ |
29 | " | 28 | " |
30 | 29 | ||
31 | # for garage-sign archive | 30 | # for garage-sign archive |
32 | SRC_URI[md5sum] = "c5e9968dfe78a7264ab9a8338c11725d" | 31 | SRC_URI[md5sum] = "e104ccd4f32e52571a5fc0e5042db050" |
33 | SRC_URI[sha256sum] = "3a19258d7a1825a308aca0da82f7a337985bec05e8951355c4c95f0fcf2444f4" | 32 | SRC_URI[sha256sum] = "c590be1a57523bfe097af82279eda5c97cf40ae47fb27162cf33c469702c8a9b" |
34 | 33 | ||
35 | SRCREV = "c50feb37034eceb1254429d3e3ed38e5b8a0dc60" | 34 | SRCREV = "fce5854ff10e7efd52d69bbaf68dc2af990d5746" |
36 | BRANCH ?= "master" | 35 | BRANCH ?= "master" |
37 | 36 | ||
38 | S = "${WORKDIR}/git" | 37 | S = "${WORKDIR}/git" |
@@ -45,7 +44,7 @@ PTEST_ENABLED = "0" | |||
45 | 44 | ||
46 | SYSTEMD_PACKAGES = "${PN} ${PN}-secondary" | 45 | SYSTEMD_PACKAGES = "${PN} ${PN}-secondary" |
47 | SYSTEMD_SERVICE_${PN} = "aktualizr.service" | 46 | SYSTEMD_SERVICE_${PN} = "aktualizr.service" |
48 | SYSTEMD_SERVICE_${PN}-secondary = "aktualizr-secondary.socket" | 47 | SYSTEMD_SERVICE_${PN}-secondary = "aktualizr-secondary.service" |
49 | 48 | ||
50 | EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DAKTUALIZR_VERSION=${PV} ${@bb.utils.contains('PTEST_ENABLED', '1', '-DTESTSUITE_VALGRIND=on', '', d)}" | 49 | EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DAKTUALIZR_VERSION=${PV} ${@bb.utils.contains('PTEST_ENABLED', '1', '-DTESTSUITE_VALGRIND=on', '', d)}" |
51 | 50 | ||
@@ -93,14 +92,12 @@ do_install_ptest() { | |||
93 | 92 | ||
94 | do_install_append () { | 93 | do_install_append () { |
95 | install -d ${D}${libdir}/sota | 94 | install -d ${D}${libdir}/sota |
96 | install -m 0644 ${S}/config/sota_autoprov.toml ${D}/${libdir}/sota/sota_autoprov.toml | 95 | install -m 0644 ${S}/config/sota-shared-cred.toml ${D}/${libdir}/sota/sota-shared-cred.toml |
97 | install -m 0644 ${S}/config/sota_autoprov_primary.toml ${D}/${libdir}/sota/sota_autoprov_primary.toml | 96 | install -m 0644 ${S}/config/sota-device-cred-hsm.toml ${D}/${libdir}/sota/sota-device-cred-hsm.toml |
98 | install -m 0644 ${S}/config/sota_hsm_prov.toml ${D}/${libdir}/sota/sota_hsm_prov.toml | 97 | install -m 0644 ${S}/config/sota-device-cred.toml ${D}/${libdir}/sota/sota-device-cred.toml |
99 | install -m 0644 ${S}/config/sota_implicit_prov_ca.toml ${D}/${libdir}/sota/sota_implicit_prov_ca.toml | 98 | install -m 0644 ${S}/config/sota-secondary.toml ${D}/${libdir}/sota/sota-secondary.toml |
100 | install -m 0644 ${S}/config/sota_secondary.toml ${D}/${libdir}/sota/sota_secondary.toml | 99 | install -m 0644 ${S}/config/sota-uboot-env.toml ${D}/${libdir}/sota/sota-uboot-env.toml |
101 | install -m 0644 ${S}/config/sota_uboot_env.toml ${D}/${libdir}/sota/sota_uboot_env.toml | ||
102 | install -d ${D}${systemd_unitdir}/system | 100 | install -d ${D}${systemd_unitdir}/system |
103 | install -m 0644 ${WORKDIR}/aktualizr-secondary.socket ${D}${systemd_unitdir}/system/aktualizr-secondary.socket | ||
104 | install -m 0644 ${WORKDIR}/aktualizr-secondary.service ${D}${systemd_unitdir}/system/aktualizr-secondary.service | 101 | install -m 0644 ${WORKDIR}/aktualizr-secondary.service ${D}${systemd_unitdir}/system/aktualizr-secondary.service |
105 | install -m 0700 -d ${D}${libdir}/sota/conf.d | 102 | install -m 0700 -d ${D}${libdir}/sota/conf.d |
106 | install -m 0700 -d ${D}${sysconfdir}/sota/conf.d | 103 | install -m 0700 -d ${D}${sysconfdir}/sota/conf.d |
@@ -175,8 +172,7 @@ FILES_${PN}-examples = " \ | |||
175 | 172 | ||
176 | FILES_${PN}-secondary = " \ | 173 | FILES_${PN}-secondary = " \ |
177 | ${bindir}/aktualizr-secondary \ | 174 | ${bindir}/aktualizr-secondary \ |
178 | ${libdir}/sota/sota_secondary.toml \ | 175 | ${libdir}/sota/sota-secondary.toml \ |
179 | ${systemd_unitdir}/system/aktualizr-secondary.socket \ | ||
180 | ${systemd_unitdir}/system/aktualizr-secondary.service \ | 176 | ${systemd_unitdir}/system/aktualizr-secondary.service \ |
181 | " | 177 | " |
182 | 178 | ||
diff --git a/recipes-sota/aktualizr/files/aktualizr-secondary.service b/recipes-sota/aktualizr/files/aktualizr-secondary.service index 9628ee3..b577ae8 100644 --- a/recipes-sota/aktualizr/files/aktualizr-secondary.service +++ b/recipes-sota/aktualizr/files/aktualizr-secondary.service | |||
@@ -1,8 +1,12 @@ | |||
1 | [Unit] | 1 | [Unit] |
2 | Description=Aktualizr SOTA Client (UPTANE Secondary) | 2 | Description=Aktualizr SOTA Client (UPTANE Secondary) |
3 | After=network.target | ||
3 | 4 | ||
4 | [Service] | 5 | [Service] |
5 | RestartSec=10 | 6 | RestartSec=10 |
6 | Restart=always | 7 | Restart=always |
7 | ExecStart=/usr/bin/aktualizr-secondary --config /usr/lib/sota/sota_secondary.toml | 8 | ExecStart=/usr/bin/aktualizr-secondary |
9 | |||
10 | [Install] | ||
11 | WantedBy=multi-user.target | ||
8 | 12 | ||
diff --git a/recipes-sota/aktualizr/files/aktualizr-secondary.socket b/recipes-sota/aktualizr/files/aktualizr-secondary.socket deleted file mode 100644 index da0ee44..0000000 --- a/recipes-sota/aktualizr/files/aktualizr-secondary.socket +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | [Socket] | ||
2 | ListenStream=9030 | ||
3 | ListenDatagram=9031 | ||
4 | |||
5 | [Install] | ||
6 | WantedBy=sockets.target \ No newline at end of file | ||
diff --git a/recipes-sota/config/aktualizr-polling-interval.bb b/recipes-sota/config/aktualizr-polling-interval.bb new file mode 100644 index 0000000..53c008a --- /dev/null +++ b/recipes-sota/config/aktualizr-polling-interval.bb | |||
@@ -0,0 +1,29 @@ | |||
1 | SUMMARY = "Set polling interval in Aktualizr" | ||
2 | DESCRIPTION = "Configures aktualizr to poll at a custom frequency (suitable for testing or other purposes)" | ||
3 | HOMEPAGE = "https://github.com/advancedtelematic/aktualizr" | ||
4 | SECTION = "base" | ||
5 | LICENSE = "MPL-2.0" | ||
6 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" | ||
7 | |||
8 | inherit allarch | ||
9 | |||
10 | SRC_URI = " \ | ||
11 | file://60-polling-interval.toml \ | ||
12 | " | ||
13 | |||
14 | SOTA_POLLING_SEC ?= "30" | ||
15 | |||
16 | do_install_append () { | ||
17 | install -m 0700 -d ${D}${libdir}/sota/conf.d | ||
18 | install -m 0644 ${WORKDIR}/60-polling-interval.toml ${D}${libdir}/sota/conf.d/60-polling-interval.toml | ||
19 | |||
20 | sed -i -e 's|@POLLING_SEC@|${SOTA_POLLING_SEC}|g' \ | ||
21 | ${D}${libdir}/sota/conf.d/60-polling-interval.toml | ||
22 | } | ||
23 | |||
24 | FILES_${PN} = " \ | ||
25 | ${libdir}/sota/conf.d/60-polling-interval.toml \ | ||
26 | " | ||
27 | |||
28 | # vim:set ts=4 sw=4 sts=4 expandtab: | ||
29 | |||
diff --git a/recipes-sota/config/files/60-polling-interval.toml b/recipes-sota/config/files/60-polling-interval.toml new file mode 100644 index 0000000..7d25d05 --- /dev/null +++ b/recipes-sota/config/files/60-polling-interval.toml | |||
@@ -0,0 +1,2 @@ | |||
1 | [uptane] | ||
2 | polling_sec = @POLLING_SEC@ | ||