Merge pull request #784 from advancedtelematic/feat/thud/2020.10

aktualizr: Upgrade thud to 2020.10 release

2 files changed, 5 insertions, 6 deletions

diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index 392a42a..4fe37a3 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -88,7 +88,7 @@ IMAGE_CMD_ostree () {
         if [ -n "${SYSTEMD_USED}" ]; then
             echo "d /var/rootdirs/${dir} 0755 root root -" >>${tmpfiles_conf}
         else
-            echo "mkdir -p /var/rootdirs/${dir}; chown 755 /var/rootdirs/${dir}" >>${tmpfiles_conf}
+            echo "mkdir -p /var/rootdirs/${dir}; chmod 755 /var/rootdirs/${dir}" >>${tmpfiles_conf}
         fi
         ln -sf var/rootdirs/${dir} ${dir}
     done
@@ -101,7 +101,7 @@ IMAGE_CMD_ostree () {
         if [ -n "${SYSTEMD_USED}" ]; then
             echo "d /var/roothome 0700 root root -" >>${tmpfiles_conf}
         else
-            echo "mkdir -p /var/roothome; chown 700 /var/roothome" >>${tmpfiles_conf}
+            echo "mkdir -p /var/roothome; chmod 700 /var/roothome" >>${tmpfiles_conf}
         fi
 
         rm -rf root
@@ -118,7 +118,7 @@ IMAGE_CMD_ostree () {
     if [ -n "${SYSTEMD_USED}" ]; then
         echo "d /var/usrlocal 0755 root root -" >>${tmpfiles_conf}
     else
-        echo "mkdir -p /var/usrlocal; chown 755 /var/usrlocal" >>${tmpfiles_conf}
+        echo "mkdir -p /var/usrlocal; chmod 755 /var/usrlocal" >>${tmpfiles_conf}
     fi
 
     dirs="bin etc games include lib man sbin share src"
@@ -127,7 +127,7 @@ IMAGE_CMD_ostree () {
         if [ -n "${SYSTEMD_USED}" ]; then
             echo "d /var/usrlocal/${dir} 0755 root root -" >>${tmpfiles_conf}
         else
-            echo "mkdir -p /var/usrlocal/${dir}; chown 755 /var/usrlocal/${dir}" >>${tmpfiles_conf}
+            echo "mkdir -p /var/usrlocal/${dir}; chmod 755 /var/usrlocal/${dir}" >>${tmpfiles_conf}
         fi
     done
 
diff --git a/classes/sota.bbclass b/classes/sota.bbclass
index fbd92b5..9241952 100644
--- a/classes/sota.bbclass
+++ b/classes/sota.bbclass
@@ -6,8 +6,7 @@ SOTA_HARDWARE_ID ??= "${MACHINE}"
 
 IMAGE_CLASSES += " image_types_ostree image_types_ota image_repo_manifest"
 IMAGE_INSTALL_append_sota = " aktualizr aktualizr-info ${SOTA_CLIENT_PROV} \
-                              ostree os-release ostree-kernel \
-                              ${@'ostree-initramfs' if d.getVar('KERNEL_IMAGETYPE') != 'fitImage' else ''} \
+                              ostree os-release ostree-kernel ostree-initramfs \
                               ${@'ostree-devicetrees' if oe.types.boolean('${OSTREE_DEPLOY_DEVICETREE}') else ''}"
 
 IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ostreepush garagesign garagecheck ota-ext4 wic', ' ', d)}"