diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2018-01-22 11:33:46 +0100 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-01-22 11:33:46 +0100 |
commit | 4b73645a95088c1f4cf034064baf09ddee9b886d (patch) | |
tree | 6b91ba5e9b37a5f10c1758efd01811908428266d /recipes-sota | |
parent | 99e49cc2e6fe29f9b58d1f38c25b7e02c72964e2 (diff) | |
parent | 19883e9d2602c9cb096bcd81b5a1c49e1faba74f (diff) | |
download | meta-updater-4b73645a95088c1f4cf034064baf09ddee9b886d.tar.gz |
Merge remote-tracking branch 'github/feat/PRJ-330/hsm-not-test' into feat/PRJ-330/hsm-not-test-rocko
Diffstat (limited to 'recipes-sota')
-rw-r--r-- | recipes-sota/aktualizr/aktualizr-hsm-prov.bb (renamed from recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb) | 2 | ||||
-rw-r--r-- | recipes-sota/aktualizr/aktualizr_git.bb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb index 1e893fa..944607c 100644 --- a/recipes-sota/aktualizr/aktualizr-hsm-test-prov.bb +++ b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb | |||
@@ -21,7 +21,7 @@ require credentials.inc | |||
21 | do_install() { | 21 | do_install() { |
22 | install -d ${D}${libdir}/sota | 22 | install -d ${D}${libdir}/sota |
23 | aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \ | 23 | aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} --no-root-ca \ |
24 | -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_test.toml -o ${D}${libdir}/sota/sota.toml -p ${D} | 24 | -i ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml -o ${D}${libdir}/sota/sota.toml -p ${D} |
25 | } | 25 | } |
26 | 26 | ||
27 | FILES_${PN} = " \ | 27 | FILES_${PN} = " \ |
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb index 48ed652..872ae9a 100644 --- a/recipes-sota/aktualizr/aktualizr_git.bb +++ b/recipes-sota/aktualizr/aktualizr_git.bb | |||
@@ -21,7 +21,7 @@ SRC_URI = " \ | |||
21 | file://aktualizr.service \ | 21 | file://aktualizr.service \ |
22 | file://aktualizr-serialcan.service \ | 22 | file://aktualizr-serialcan.service \ |
23 | " | 23 | " |
24 | SRCREV = "e53f2a5747bba3e4f40609aa27f3d89e80c2d784" | 24 | SRCREV = "07d73645231681848bd943074498581e930d8582" |
25 | BRANCH ?= "master" | 25 | BRANCH ?= "master" |
26 | 26 | ||
27 | S = "${WORKDIR}/git" | 27 | S = "${WORKDIR}/git" |
@@ -55,7 +55,7 @@ do_install_append_class-native () { | |||
55 | rm -f ${D}${bindir}/example-interface | 55 | rm -f ${D}${bindir}/example-interface |
56 | install -d ${D}${libdir}/sota | 56 | install -d ${D}${libdir}/sota |
57 | install -m 0644 ${S}/config/sota_autoprov.toml ${D}/${libdir}/sota/sota_autoprov.toml | 57 | install -m 0644 ${S}/config/sota_autoprov.toml ${D}/${libdir}/sota/sota_autoprov.toml |
58 | install -m 0644 ${S}/config/sota_hsm_test.toml ${D}/${libdir}/sota/sota_hsm_test.toml | 58 | install -m 0644 ${S}/config/sota_hsm_prov.toml ${D}/${libdir}/sota/sota_hsm_prov.toml |
59 | install -m 0644 ${S}/config/sota_implicit_prov.toml ${D}/${libdir}/sota/sota_implicit_prov.toml | 59 | install -m 0644 ${S}/config/sota_implicit_prov.toml ${D}/${libdir}/sota/sota_implicit_prov.toml |
60 | 60 | ||
61 | install -m 0755 ${B}/src/sota_tools/garage-sign-prefix/src/garage-sign/bin/* ${D}${bindir} | 61 | install -m 0755 ${B}/src/sota_tools/garage-sign-prefix/src/garage-sign/bin/* ${D}${bindir} |