diff options
| author | cajun-rat <phil@advancedtelematic.com> | 2017-12-12 09:52:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 09:52:37 +0100 |
| commit | 904bc291f642f99302a8513d17ad02ff0544a543 (patch) | |
| tree | 05851334e1b3a5c4ee95b0a1549ce00355a5ffb6 /recipes-sota | |
| parent | dbeb10e4e735e51e482323b283be426f96eceeb3 (diff) | |
| parent | d64e6f3f1367786c9c3cf77dc5a288259bfb28b6 (diff) | |
| download | meta-updater-904bc291f642f99302a8513d17ad02ff0544a543.tar.gz | |
Merge pull request #208 from advancedtelematic/bugfix/PRO-4524/credentials
Rerun provisioning recipes when credentials have changed
Diffstat (limited to 'recipes-sota')
| -rw-r--r-- | recipes-sota/aktualizr/aktualizr-auto-prov.bb | 1 | ||||
| -rw-r--r-- | recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb | 1 | ||||
| -rw-r--r-- | recipes-sota/aktualizr/aktualizr-implicit-prov.bb | 1 | ||||
| -rw-r--r-- | recipes-sota/aktualizr/credentials.inc | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb index 43b23f9..c97cbb8 100644 --- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb | |||
| @@ -19,6 +19,7 @@ SYSTEMD_SERVICE_${PN} = "aktualizr.service" | |||
| 19 | inherit systemd | 19 | inherit systemd |
| 20 | 20 | ||
| 21 | require environment.inc | 21 | require environment.inc |
| 22 | require credentials.inc | ||
| 22 | 23 | ||
| 23 | export SOTA_PACKED_CREDENTIALS | 24 | export SOTA_PACKED_CREDENTIALS |
| 24 | 25 | ||
diff --git a/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb index b1b2bff..8779c67 100644 --- a/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb | |||
| @@ -20,6 +20,7 @@ SYSTEMD_SERVICE_${PN} = "aktualizr.service" | |||
| 20 | inherit systemd | 20 | inherit systemd |
| 21 | 21 | ||
| 22 | require environment.inc | 22 | require environment.inc |
| 23 | require credentials.inc | ||
| 23 | 24 | ||
| 24 | do_install() { | 25 | do_install() { |
| 25 | install -d ${D}${systemd_unitdir}/system | 26 | install -d ${D}${systemd_unitdir}/system |
diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb index f73829d..c8f0741 100644 --- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb | |||
| @@ -19,6 +19,7 @@ SYSTEMD_SERVICE_${PN} = "aktualizr.service" | |||
| 19 | inherit systemd | 19 | inherit systemd |
| 20 | 20 | ||
| 21 | require environment.inc | 21 | require environment.inc |
| 22 | require credentials.inc | ||
| 22 | 23 | ||
| 23 | do_install() { | 24 | do_install() { |
| 24 | install -d ${D}${systemd_unitdir}/system | 25 | install -d ${D}${systemd_unitdir}/system |
diff --git a/recipes-sota/aktualizr/credentials.inc b/recipes-sota/aktualizr/credentials.inc new file mode 100644 index 0000000..fe09550 --- /dev/null +++ b/recipes-sota/aktualizr/credentials.inc | |||
| @@ -0,0 +1 @@ | |||
| SRC_URI_append = "${@'file://${SOTA_PACKED_CREDENTIALS}' if d.getVar('SOTA_PACKED_CREDENTIALS', True) else ' '}" | |||