diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2018-06-01 14:42:27 +0200 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-06-04 10:01:15 +0200 |
commit | f00803eb16ab636885757a41f2720bc4ba760820 (patch) | |
tree | 106333e50576b2c14b2a7377aefe756b04e5035b /recipes-sota/aktualizr/aktualizr-auto-prov.bb | |
parent | deb1b7c09a9255428bdb455326c0f3de6ec94388 (diff) | |
download | meta-updater-f00803eb16ab636885757a41f2720bc4ba760820.tar.gz |
aktualizr: Upgrade to use simplified implicit_writer config.
There is no longer a need for dumping the whole config, now we can just
add what we need to a new config file and use that in addition to the
base config. This simplifies several things and fixes a few bugs.
Also renamed the configs to make provenance a little clearer.
Diffstat (limited to 'recipes-sota/aktualizr/aktualizr-auto-prov.bb')
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-auto-prov.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb index c7f1240..7f4f2e4 100644 --- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb | |||
@@ -35,7 +35,8 @@ do_install() { | |||
35 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then | 35 | if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then |
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} ${D}${libdir}/sota/conf.d/20-sota.toml | 38 | install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/${aktualizr_toml} \ |
39 | ${D}${libdir}/sota/conf.d/20-${aktualizr_toml}.toml | ||
39 | 40 | ||
40 | # deploy SOTA credentials | 41 | # deploy SOTA credentials |
41 | if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then | 42 | if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then |
@@ -48,7 +49,7 @@ do_install() { | |||
48 | 49 | ||
49 | FILES_${PN} = " \ | 50 | FILES_${PN} = " \ |
50 | ${libdir}/sota/conf.d \ | 51 | ${libdir}/sota/conf.d \ |
51 | ${libdir}/sota/conf.d/20-sota.toml \ | 52 | ${libdir}/sota/conf.d/20-${aktualizr_toml}.toml \ |
52 | ${localstatedir}/sota \ | 53 | ${localstatedir}/sota \ |
53 | ${localstatedir}/sota/sota_provisioning_credentials.zip \ | 54 | ${localstatedir}/sota/sota_provisioning_credentials.zip \ |
54 | " | 55 | " |