From c115a66ba9cfbd9656d26af81fe41f2b32d85628 Mon Sep 17 00:00:00 2001 From: Corey Minyard Date: Fri, 1 Mar 2019 17:04:37 -0600 Subject: 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 --- recipes-sota/aktualizr/aktualizr-auto-prov.bb | 2 +- recipes-sota/aktualizr/aktualizr-hsm-prov.bb | 2 +- recipes-sota/aktualizr/aktualizr-uboot-env-rollback.bb | 2 +- 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() { install -m 0700 -d ${D}${libdir}/sota/conf.d aktualizr_toml=${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'secondary-network', 'sota_autoprov_primary.toml', 'sota_autoprov.toml', d)} - install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/${aktualizr_toml} \ + install -m 0644 ${STAGING_DIR_NATIVE}${libdir_native}/sota/${aktualizr_toml} \ ${D}${libdir}/sota/conf.d/20-${aktualizr_toml} } 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 do_install() { install -m 0700 -d ${D}${libdir}/sota/conf.d - install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_hsm_prov.toml \ + install -m 0644 ${STAGING_DIR_NATIVE}${libdir_native}/sota/sota_hsm_prov.toml \ ${D}${libdir}/sota/conf.d/20-sota_hsm_prov.toml } 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" do_install() { install -m 0700 -d ${D}${libdir}/sota/conf.d - install -m 0644 ${STAGING_DIR_NATIVE}${libdir}/sota/sota_uboot_env.toml ${D}${libdir}/sota/conf.d/30-rollback.toml + install -m 0644 ${STAGING_DIR_NATIVE}${libdir_native}/sota/sota_uboot_env.toml ${D}${libdir}/sota/conf.d/30-rollback.toml } FILES_${PN} = " \ -- cgit v1.2.3-54-g00ecf