summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcajun-rat <phil@advancedtelematic.com>2017-12-12 09:52:37 +0100
committerGitHub <noreply@github.com>2017-12-12 09:52:37 +0100
commit904bc291f642f99302a8513d17ad02ff0544a543 (patch)
tree05851334e1b3a5c4ee95b0a1549ce00355a5ffb6
parentdbeb10e4e735e51e482323b283be426f96eceeb3 (diff)
parentd64e6f3f1367786c9c3cf77dc5a288259bfb28b6 (diff)
downloadmeta-updater-904bc291f642f99302a8513d17ad02ff0544a543.tar.gz
Merge pull request #208 from advancedtelematic/bugfix/PRO-4524/credentials
Rerun provisioning recipes when credentials have changed
-rw-r--r--recipes-sota/aktualizr/aktualizr-auto-prov.bb1
-rw-r--r--recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb1
-rw-r--r--recipes-sota/aktualizr/aktualizr-implicit-prov.bb1
-rw-r--r--recipes-sota/aktualizr/credentials.inc1
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"
19inherit systemd 19inherit systemd
20 20
21require environment.inc 21require environment.inc
22require credentials.inc
22 23
23export SOTA_PACKED_CREDENTIALS 24export 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"
20inherit systemd 20inherit systemd
21 21
22require environment.inc 22require environment.inc
23require credentials.inc
23 24
24do_install() { 25do_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"
19inherit systemd 19inherit systemd
20 20
21require environment.inc 21require environment.inc
22require credentials.inc
22 23
23do_install() { 24do_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 ' '}"