From 27f7b0d5d417565f12185947829b94949af8c6b5 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Wed, 6 Jun 2018 15:38:55 +0200 Subject: aktualizr-auto-prov: Remove redundant '.toml'. --- recipes-sota/aktualizr/aktualizr-auto-prov.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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() { aktualizr_toml=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-network', 'sota_autoprov_primary.toml', 'sota_autoprov.toml', d)} install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/${aktualizr_toml} \ - ${D}${libdir}/sota/conf.d/20-${aktualizr_toml}.toml + ${D}${libdir}/sota/conf.d/20-${aktualizr_toml} # deploy SOTA credentials if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then @@ -49,7 +49,7 @@ do_install() { FILES_${PN} = " \ ${libdir}/sota/conf.d \ - ${libdir}/sota/conf.d/20-${aktualizr_toml}.toml \ + ${libdir}/sota/conf.d/20-${aktualizr_toml} \ ${localstatedir}/sota \ ${localstatedir}/sota/sota_provisioning_credentials.zip \ " -- cgit v1.2.3-54-g00ecf From d8118bfac0117a352aa6a7b2a47c967ca5a615d0 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Tue, 12 Jun 2018 09:16:19 +0200 Subject: sota.bbclass: remove obsolete/incorrect comment. --- classes/sota.bbclass | 1 - 1 file changed, 1 deletion(-) 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 # Please redefine OSTREE_REPO in order to have a persistent OSTree repo OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo" -# For UPTANE operation, OSTREE_BRANCHNAME must start with "${MACHINE}-" OSTREE_BRANCHNAME ?= "${MACHINE}" OSTREE_OSNAME ?= "poky" OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image" -- cgit v1.2.3-54-g00ecf From a4ba4ee5c831a156d52b1472941e43057cfdf2eb Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Tue, 12 Jun 2018 10:05:00 +0200 Subject: CONTRIBUTING.adoc: clarify which branches have what status. --- CONTRIBUTING.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index df7a717..93a0815 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -1,4 +1,5 @@ = Contributing -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. +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. +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. -- cgit v1.2.3-54-g00ecf From 506b115bf8b554def506b8c139f9eb56eba4bc5f Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Wed, 13 Jun 2018 10:23:46 +0200 Subject: aktualizr: Bump to latest. No longer provide input config to implicit_writer. --- recipes-sota/aktualizr/aktualizr-hsm-prov.bb | 1 - recipes-sota/aktualizr/aktualizr-implicit-prov.bb | 1 - recipes-sota/aktualizr/aktualizr_git.bb | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) 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() { ${D}${libdir}/sota/conf.d/20-sota_hsm_prov.toml if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \ - -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml \ -o ${D}${libdir}/sota/conf.d/30-implicit_server.toml -p ${D} fi } 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() { ${D}${libdir}/sota/conf.d/20-sota_implicit_prov.toml if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} \ - -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_implicit_prov.toml \ -o ${D}${libdir}/sota/conf.d/30-implicit_server.toml -p ${D} fi } diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 8dc4b31..f2c01d4 100755 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb @@ -23,7 +23,7 @@ SRC_URI = " \ file://aktualizr-secondary.socket \ file://aktualizr-serialcan.service \ " -SRCREV = "114dc6c519ca9a605d73ad292821348607d0fa12" +SRCREV = "17c2eea66ebddbf47a37d66df7a0441225bd0db6" BRANCH ?= "master" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf From 75941b4bb6088da229d6b676f8efa54398e7f262 Mon Sep 17 00:00:00 2001 From: Patrick Vacek Date: Thu, 14 Jun 2018 12:25:17 +0200 Subject: updater.py: Fix longstanding typo. --- lib/oeqa/selftest/cases/updater.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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): if re.search(layer, result.output) is None: # Assume the directory layout for finding other layers. We could also # make assumptions by using 'show-layers', but either way, if the - # layers we need aren't where we expect them, we are out of like. + # layers we need aren't where we expect them, we are out of luck. path = os.path.abspath(os.path.dirname(__file__)) metadir = path + "/../../../../../" self.meta_qemu = metadir + layer @@ -204,7 +204,7 @@ class RpiTests(OESelftestTestCase): result = runCmd('bitbake-layers show-layers') # Assume the directory layout for finding other layers. We could also # make assumptions by using 'show-layers', but either way, if the - # layers we need aren't where we expect them, we are out of like. + # layers we need aren't where we expect them, we are out of luck. path = os.path.abspath(os.path.dirname(__file__)) metadir = path + "/../../../../../" if re.search(layer_python, result.output) is None: @@ -277,7 +277,7 @@ class GrubTests(OESelftestTestCase): result = runCmd('bitbake-layers show-layers') # Assume the directory layout for finding other layers. We could also # make assumptions by using 'show-layers', but either way, if the - # layers we need aren't where we expect them, we are out of like. + # layers we need aren't where we expect them, we are out of luck. path = os.path.abspath(os.path.dirname(__file__)) metadir = path + "/../../../../../" if re.search(layer_intel, result.output) is None: @@ -339,7 +339,7 @@ class ImplProvTests(OESelftestTestCase): if re.search(layer, result.output) is None: # Assume the directory layout for finding other layers. We could also # make assumptions by using 'show-layers', but either way, if the - # layers we need aren't where we expect them, we are out of like. + # layers we need aren't where we expect them, we are out of luck. path = os.path.abspath(os.path.dirname(__file__)) metadir = path + "/../../../../../" self.meta_qemu = metadir + layer @@ -409,7 +409,7 @@ class HsmTests(OESelftestTestCase): if re.search(layer, result.output) is None: # Assume the directory layout for finding other layers. We could also # make assumptions by using 'show-layers', but either way, if the - # layers we need aren't where we expect them, we are out of like. + # layers we need aren't where we expect them, we are out of luck. path = os.path.abspath(os.path.dirname(__file__)) metadir = path + "/../../../../../" self.meta_qemu = metadir + layer @@ -527,7 +527,7 @@ class SecondaryTests(OESelftestTestCase): if re.search(layer, result.output) is None: # Assume the directory layout for finding other layers. We could also # make assumptions by using 'show-layers', but either way, if the - # layers we need aren't where we expect them, we are out of like. + # layers we need aren't where we expect them, we are out of luck. path = os.path.abspath(os.path.dirname(__file__)) metadir = path + "/../../../../../" self.meta_qemu = metadir + layer @@ -572,7 +572,7 @@ class PrimaryTests(OESelftestTestCase): if re.search(layer, result.output) is None: # Assume the directory layout for finding other layers. We could also # make assumptions by using 'show-layers', but either way, if the - # layers we need aren't where we expect them, we are out of like. + # layers we need aren't where we expect them, we are out of luck. path = os.path.abspath(os.path.dirname(__file__)) metadir = path + "/../../../../../" self.meta_qemu = metadir + layer -- cgit v1.2.3-54-g00ecf