summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Minyard <cminyard@mvista.com>2019-03-01 17:04:37 -0600
committerCorey Minyard <cminyard@mvista.com>2019-03-01 17:04:37 -0600
commitc115a66ba9cfbd9656d26af81fe41f2b32d85628 (patch)
treeee88944692a313767f4cc60ef917fcde43f52d9f
parenta512fd6e0d519058fe0448098d064aa7e45dc7db (diff)
downloadmeta-updater-c115a66ba9cfbd9656d26af81fe41f2b32d85628.tar.gz
aktualizr: Use ${libdir_native} when referring to native files
Several recipes had ${STAGING_DIR_NATIVE}${libdir}, which won't work if ${libdir} != ${libdir_native}. Signed-off-by: Corey Minyard <cminyard@mvista.com>
-rw-r--r--recipes-sota/aktualizr/aktualizr-auto-prov.bb2
-rw-r--r--recipes-sota/aktualizr/aktualizr-hsm-prov.bb2
-rw-r--r--recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb
index f506cab..be12a59 100644
--- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb
@@ -31,7 +31,7 @@ do_install() {
31 install -m 0700 -d ${D}${libdir}/sota/conf.d 31 install -m 0700 -d ${D}${libdir}/sota/conf.d
32 aktualizr_toml=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-network', 'sota_autoprov_primary.toml', 'sota_autoprov.toml', d)} 32 aktualizr_toml=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-network', 'sota_autoprov_primary.toml', 'sota_autoprov.toml', d)}
33 33
34 install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/${aktualizr_toml} \ 34 install -m 0644 ${STAGING_DIR_NATIVE}${libdir_native}/sota/${aktualizr_toml} \
35 ${D}${libdir}/sota/conf.d/20-${aktualizr_toml} 35 ${D}${libdir}/sota/conf.d/20-${aktualizr_toml}
36} 36}
37 37
diff --git a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
index 08fffe9..dfe397c 100644
--- a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
@@ -16,7 +16,7 @@ require credentials.inc
16 16
17do_install() { 17do_install() {
18 install -m 0700 -d ${D}${libdir}/sota/conf.d 18 install -m 0700 -d ${D}${libdir}/sota/conf.d
19 install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml \ 19 install -m 0644 ${STAGING_DIR_NATIVE}${libdir_native}/sota/sota_hsm_prov.toml \
20 ${D}${libdir}/sota/conf.d/20-sota_hsm_prov.toml 20 ${D}${libdir}/sota/conf.d/20-sota_hsm_prov.toml
21} 21}
22 22
diff --git a/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb b/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb
index cf75e79..6702d29 100644
--- a/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb
+++ b/recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb
@@ -8,7 +8,7 @@ RDEPENDS_${PN} = "aktualizr"
8 8
9do_install() { 9do_install() {
10 install -m 0700 -d ${D}${libdir}/sota/conf.d 10 install -m 0700 -d ${D}${libdir}/sota/conf.d
11 install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_uboot_env.toml ${D}${libdir}/sota/conf.d/30-rollback.toml 11 install -m 0644 ${STAGING_DIR_NATIVE}${libdir_native}/sota/sota_uboot_env.toml ${D}${libdir}/sota/conf.d/30-rollback.toml
12} 12}
13 13
14FILES_${PN} = " \ 14FILES_${PN} = " \