diff options
-rw-r--r-- | CONTRIBUTING.adoc | 3 | ||||
-rw-r--r-- | classes/sota.bbclass | 1 | ||||
-rw-r--r-- | lib/oeqa/selftest/cases/updater.py | 14 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-auto-prov.bb | 4 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-hsm-prov.bb | 1 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-implicit-prov.bb | 1 |
6 files changed, 11 insertions, 13 deletions
diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index df7a717..93a0815 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc | |||
@@ -1,4 +1,5 @@ | |||
1 | = Contributing | 1 | = Contributing |
2 | 2 | ||
3 | We welcome pull requests from everyone. It may be helpful to read the README and other documentation for link:README.adoc[this repo], https://github.com/advancedtelematic/aktualizr[aktualizr], and the https://github.com/advancedtelematic/updater-repo/[updater-repo], particularly the sections and development and debugging. | 3 | We welcome pull requests from anyone. The master branch is the primary branch for development, and if you wish to add new functionality, it probably belongs there. We attempt to maintain recent previous branches and welcome bug fixes and backports for those. Currently, the actively maintained branches are sumo, rocko, and pyro. Previously, morty was also a stable branch, but it has not been updated or actively maintained for a while. |
4 | 4 | ||
5 | If you are developing with meta-updater, it may be helpful to read the README and other documentation for link:README.adoc[this repo], https://github.com/advancedtelematic/aktualizr[aktualizr], and the https://github.com/advancedtelematic/updater-repo/[updater-repo], particularly the sections about development and debugging. | ||
diff --git a/classes/sota.bbclass b/classes/sota.bbclass index 38d4ce5..e1c5ecd 100644 --- a/classes/sota.bbclass +++ b/classes/sota.bbclass | |||
@@ -24,7 +24,6 @@ OSTREE_INITRAMFS_FSTYPES ??= "${@oe.utils.ifelse(d.getVar('OSTREE_BOOTLOADER', T | |||
24 | 24 | ||
25 | # Please redefine OSTREE_REPO in order to have a persistent OSTree repo | 25 | # Please redefine OSTREE_REPO in order to have a persistent OSTree repo |
26 | OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" | 26 | OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" |
27 | # For UPTANE operation, OSTREE_BRANCHNAME must start with "${MACHINE}-" | ||
28 | OSTREE_BRANCHNAME ?= "${MACHINE}" | 27 | OSTREE_BRANCHNAME ?= "${MACHINE}" |
29 | OSTREE_OSNAME ?= "poky" | 28 | OSTREE_OSNAME ?= "poky" |
30 | OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image" | 29 | OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image" |
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index f55bc34..190d85d 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py | |||
@@ -141,7 +141,7 @@ class AutoProvTests(OESelftestTestCase): | |||
141 | if re.search(layer, result.output) is None: | 141 | if re.search(layer, result.output) is None: |
142 | # Assume the directory layout for finding other layers. We could also | 142 | # Assume the directory layout for finding other layers. We could also |
143 | # make assumptions by using 'show-layers', but either way, if the | 143 | # make assumptions by using 'show-layers', but either way, if the |
144 | # layers we need aren't where we expect them, we are out of like. | 144 | # layers we need aren't where we expect them, we are out of luck. |
145 | path = os.path.abspath(os.path.dirname(__file__)) | 145 | path = os.path.abspath(os.path.dirname(__file__)) |
146 | metadir = path + "/../../../../../" | 146 | metadir = path + "/../../../../../" |
147 | self.meta_qemu = metadir + layer | 147 | self.meta_qemu = metadir + layer |
@@ -204,7 +204,7 @@ class RpiTests(OESelftestTestCase): | |||
204 | result = runCmd('bitbake-layers show-layers') | 204 | result = runCmd('bitbake-layers show-layers') |
205 | # Assume the directory layout for finding other layers. We could also | 205 | # Assume the directory layout for finding other layers. We could also |
206 | # make assumptions by using 'show-layers', but either way, if the | 206 | # make assumptions by using 'show-layers', but either way, if the |
207 | # layers we need aren't where we expect them, we are out of like. | 207 | # layers we need aren't where we expect them, we are out of luck. |
208 | path = os.path.abspath(os.path.dirname(__file__)) | 208 | path = os.path.abspath(os.path.dirname(__file__)) |
209 | metadir = path + "/../../../../../" | 209 | metadir = path + "/../../../../../" |
210 | if re.search(layer_python, result.output) is None: | 210 | if re.search(layer_python, result.output) is None: |
@@ -277,7 +277,7 @@ class GrubTests(OESelftestTestCase): | |||
277 | result = runCmd('bitbake-layers show-layers') | 277 | result = runCmd('bitbake-layers show-layers') |
278 | # Assume the directory layout for finding other layers. We could also | 278 | # Assume the directory layout for finding other layers. We could also |
279 | # make assumptions by using 'show-layers', but either way, if the | 279 | # make assumptions by using 'show-layers', but either way, if the |
280 | # layers we need aren't where we expect them, we are out of like. | 280 | # layers we need aren't where we expect them, we are out of luck. |
281 | path = os.path.abspath(os.path.dirname(__file__)) | 281 | path = os.path.abspath(os.path.dirname(__file__)) |
282 | metadir = path + "/../../../../../" | 282 | metadir = path + "/../../../../../" |
283 | if re.search(layer_intel, result.output) is None: | 283 | if re.search(layer_intel, result.output) is None: |
@@ -339,7 +339,7 @@ class ImplProvTests(OESelftestTestCase): | |||
339 | if re.search(layer, result.output) is None: | 339 | if re.search(layer, result.output) is None: |
340 | # Assume the directory layout for finding other layers. We could also | 340 | # Assume the directory layout for finding other layers. We could also |
341 | # make assumptions by using 'show-layers', but either way, if the | 341 | # make assumptions by using 'show-layers', but either way, if the |
342 | # layers we need aren't where we expect them, we are out of like. | 342 | # layers we need aren't where we expect them, we are out of luck. |
343 | path = os.path.abspath(os.path.dirname(__file__)) | 343 | path = os.path.abspath(os.path.dirname(__file__)) |
344 | metadir = path + "/../../../../../" | 344 | metadir = path + "/../../../../../" |
345 | self.meta_qemu = metadir + layer | 345 | self.meta_qemu = metadir + layer |
@@ -409,7 +409,7 @@ class HsmTests(OESelftestTestCase): | |||
409 | if re.search(layer, result.output) is None: | 409 | if re.search(layer, result.output) is None: |
410 | # Assume the directory layout for finding other layers. We could also | 410 | # Assume the directory layout for finding other layers. We could also |
411 | # make assumptions by using 'show-layers', but either way, if the | 411 | # make assumptions by using 'show-layers', but either way, if the |
412 | # layers we need aren't where we expect them, we are out of like. | 412 | # layers we need aren't where we expect them, we are out of luck. |
413 | path = os.path.abspath(os.path.dirname(__file__)) | 413 | path = os.path.abspath(os.path.dirname(__file__)) |
414 | metadir = path + "/../../../../../" | 414 | metadir = path + "/../../../../../" |
415 | self.meta_qemu = metadir + layer | 415 | self.meta_qemu = metadir + layer |
@@ -527,7 +527,7 @@ class SecondaryTests(OESelftestTestCase): | |||
527 | if re.search(layer, result.output) is None: | 527 | if re.search(layer, result.output) is None: |
528 | # Assume the directory layout for finding other layers. We could also | 528 | # Assume the directory layout for finding other layers. We could also |
529 | # make assumptions by using 'show-layers', but either way, if the | 529 | # make assumptions by using 'show-layers', but either way, if the |
530 | # layers we need aren't where we expect them, we are out of like. | 530 | # layers we need aren't where we expect them, we are out of luck. |
531 | path = os.path.abspath(os.path.dirname(__file__)) | 531 | path = os.path.abspath(os.path.dirname(__file__)) |
532 | metadir = path + "/../../../../../" | 532 | metadir = path + "/../../../../../" |
533 | self.meta_qemu = metadir + layer | 533 | self.meta_qemu = metadir + layer |
@@ -572,7 +572,7 @@ class PrimaryTests(OESelftestTestCase): | |||
572 | if re.search(layer, result.output) is None: | 572 | if re.search(layer, result.output) is None: |
573 | # Assume the directory layout for finding other layers. We could also | 573 | # Assume the directory layout for finding other layers. We could also |
574 | # make assumptions by using 'show-layers', but either way, if the | 574 | # make assumptions by using 'show-layers', but either way, if the |
575 | # layers we need aren't where we expect them, we are out of like. | 575 | # layers we need aren't where we expect them, we are out of luck. |
576 | path = os.path.abspath(os.path.dirname(__file__)) | 576 | path = os.path.abspath(os.path.dirname(__file__)) |
577 | metadir = path + "/../../../../../" | 577 | metadir = path + "/../../../../../" |
578 | self.meta_qemu = metadir + layer | 578 | self.meta_qemu = metadir + layer |
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb index 7f4f2e4..77f8f22 100644 --- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb | |||
@@ -36,7 +36,7 @@ do_install() { | |||
36 | aktualizr_toml=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-network', 'sota_autoprov_primary.toml', 'sota_autoprov.toml', d)} | 36 | aktualizr_toml=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-network', 'sota_autoprov_primary.toml', 'sota_autoprov.toml', d)} |
37 | 37 | ||
38 | install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/${aktualizr_toml} \ | 38 | install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/${aktualizr_toml} \ |
39 | ${D}${libdir}/sota/conf.d/20-${aktualizr_toml}.toml | 39 | ${D}${libdir}/sota/conf.d/20-${aktualizr_toml} |
40 | 40 | ||
41 | # deploy SOTA credentials | 41 | # deploy SOTA credentials |
42 | if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then | 42 | if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then |
@@ -49,7 +49,7 @@ do_install() { | |||
49 | 49 | ||
50 | FILES_${PN} = " \ | 50 | FILES_${PN} = " \ |
51 | ${libdir}/sota/conf.d \ | 51 | ${libdir}/sota/conf.d \ |
52 | ${libdir}/sota/conf.d/20-${aktualizr_toml}.toml \ | 52 | ${libdir}/sota/conf.d/20-${aktualizr_toml} \ |
53 | ${localstatedir}/sota \ | 53 | ${localstatedir}/sota \ |
54 | ${localstatedir}/sota/sota_provisioning_credentials.zip \ | 54 | ${localstatedir}/sota/sota_provisioning_credentials.zip \ |
55 | " | 55 | " |
diff --git a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb index d526cd2..a5ce3b0 100644 --- a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb | |||
@@ -23,7 +23,6 @@ do_install() { | |||
23 | ${D}${libdir}/sota/conf.d/20-sota_hsm_prov.toml | 23 | ${D}${libdir}/sota/conf.d/20-sota_hsm_prov.toml |
24 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 24 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
25 | aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \ | 25 | aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \ |
26 | -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml \ | ||
27 | -o ${D}${libdir}/sota/conf.d/30-implicit_server.toml -p ${D} | 26 | -o ${D}${libdir}/sota/conf.d/30-implicit_server.toml -p ${D} |
28 | fi | 27 | fi |
29 | } | 28 | } |
diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb index e08eeef..544e83d 100644 --- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb | |||
@@ -23,7 +23,6 @@ do_install() { | |||
23 | ${D}${libdir}/sota/conf.d/20-sota_implicit_prov.toml | 23 | ${D}${libdir}/sota/conf.d/20-sota_implicit_prov.toml |
24 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 24 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
25 | aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} \ | 25 | aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} \ |
26 | -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov.toml \ | ||
27 | -o ${D}${libdir}/sota/conf.d/30-implicit_server.toml -p ${D} | 26 | -o ${D}${libdir}/sota/conf.d/30-implicit_server.toml -p ${D} |
28 | fi | 27 | fi |
29 | } | 28 | } |