Clean up recipes according to Yocto recommendations.

* Use ${libdir} and ${bindir} wherever possible.
* Use rm -f so that tasks are repeatable.

4 files changed, 13 insertions, 13 deletions

diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/recipes-sota/aktualizr/aktualizr-auto-prov.bb
index 48777b2..4f9fe4f 100644
--- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-auto-prov.bb
@@ -39,8 +39,8 @@ do_install_append() {
     if [ -n "${SOTA_PACKED_CREDENTIALS}" ]; then
         install -d ${D}/${systemd_unitdir}/system
         install -m 0644 ${WORKDIR}/aktualizr-autoprovision.service ${D}/${systemd_unitdir}/system/aktualizr.service
-        install -d ${D}/usr/lib/sota
-        install -m "0644" ${WORKDIR}/sota_autoprov.toml ${D}/usr/lib/sota/sota.toml
+        install -d ${D}${libdir}/sota
+        install -m "0644" ${WORKDIR}/sota_autoprov.toml ${D}${libdir}/sota/sota.toml
 
       # deploy SOTA credentials
       if [ -e ${SOTA_PACKED_CREDENTIALS} ]; then
@@ -57,6 +57,6 @@ do_install_append() {
 
 FILES_${PN} = " \
                 ${systemd_unitdir}/system/aktualizr.service \
-                /usr/lib/sota/sota.toml \
+                ${libdir}/sota/sota.toml \
                 /var/sota/sota_provisioning_credentials.zip \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
index a01ef48..21e38c9 100644
--- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
+++ b/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
@@ -22,13 +22,13 @@ inherit systemd
 do_install() {
     install -d ${D}/${systemd_unitdir}/system
     install -m 0644 ${WORKDIR}/aktualizr-autoprovision.service ${D}/${systemd_unitdir}/system/aktualizr.service
-    install -d ${D}/usr/lib/sota
+    install -d ${D}${libdir}/sota
     aktualizr_implicit_writer -c ${SOTA_PACKED_CREDENTIALS} \
-        -i ${WORKDIR}/sota_implicit_prov.toml -o ${D}/usr/lib/sota/sota.toml -p ${D}
+        -i ${WORKDIR}/sota_implicit_prov.toml -o ${D}${libdir}/sota/sota.toml -p ${D}
 }
 
 FILES_${PN} = " \
                 ${systemd_unitdir}/system/aktualizr.service \
-                /usr/lib/sota/sota.toml \
-                /usr/lib/sota/root.crt \
+                ${libdir}/sota/sota.toml \
+                ${libdir}/sota/root.crt \
                 "
diff --git a/recipes-sota/aktualizr/aktualizr-native_git.bb b/recipes-sota/aktualizr/aktualizr-native_git.bb
index b89e9de..70ebdf0 100644
--- a/recipes-sota/aktualizr/aktualizr-native_git.bb
+++ b/recipes-sota/aktualizr/aktualizr-native_git.bb
@@ -7,9 +7,9 @@ inherit native
 EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_SOTA_TOOLS=ON -DBUILD_OSTREE=OFF -DAKTUALIZR_VERSION=${PV}"
 
 do_install_append () {
-    rm ${D}${bindir}/aktualizr
-    rm ${D}${bindir}/aktualizr_cert_provider
-    rm ${D}${bindir}/garage-deploy
+    rm -f ${D}${bindir}/aktualizr
+    rm -f ${D}${bindir}/aktualizr_cert_provider
+    rm -f ${D}${bindir}/garage-deploy
 }
 
 FILES_${PN} = " \
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/recipes-sota/aktualizr/aktualizr_git.bb
index 1b3986a..7c65eb7 100644
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/recipes-sota/aktualizr/aktualizr_git.bb
@@ -12,9 +12,9 @@ inherit systemd
 EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_OSTREE=ON ${@bb.utils.contains('SOTA_CLIENT_FEATURES', 'hsm', '-DBUILD_P11=ON', '', d)} -DAKTUALIZR_VERSION=${PV}"
 
 do_install_append () {
-    rm ${D}${bindir}/aktualizr_cert_provider
-    rm ${D}${bindir}/aktualizr_implicit_writer
-    rm ${D}${bindir}/garage-deploy
+    rm -f ${D}${bindir}/aktualizr_cert_provider
+    rm -f ${D}${bindir}/aktualizr_implicit_writer
+    rm -f ${D}${bindir}/garage-deploy
 }
 
 FILES_${PN} = " \