3 files changed, 16 insertions, 8 deletions

diff --git a/classes/image_types_ostree.bbclass b/classes/image_types_ostree.bbclass
index b525738..a5d43dc 100644
--- a/classes/image_types_ostree.bbclass
+++ b/classes/image_types_ostree.bbclass
@@ -32,6 +32,12 @@ IMAGE_CMD_ostree () {
 
     cd ${OSTREE_ROOTFS}
 
+    for d in var/*; do
+      if [ "${d}" != "var/local" ]; then
+        rm -rf ${d}
+      fi
+    done
+
     # Create sysroot directory to which physical sysroot will be mounted
     mkdir sysroot
     ln -sf sysroot/ostree ostree
diff --git a/classes/image_types_ota.bbclass b/classes/image_types_ota.bbclass
index 0b2f7a1..cd58080 100644
--- a/classes/image_types_ota.bbclass
+++ b/classes/image_types_ota.bbclass
@@ -99,13 +99,15 @@ fakeroot do_otasetup () {
         # Copy deployment /home and /var/sota to sysroot
         HOME_TMP=`mktemp -d ${WORKDIR}/home-tmp-XXXXX`
 
-        tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs ./var/sota ./var/local || true
-        mv ${HOME_TMP}/var/sota ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true
-        mv ${HOME_TMP}/var/local ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true
+        tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs ./var/local || true
+
+        cp -a ${IMAGE_ROOTFS}/var/sota ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true
         # Create /var/sota if it doesn't exist yet
         mkdir -p ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota || true
         # Ensure the permissions are correctly set
         chmod 700 ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/sota
+
+        mv ${HOME_TMP}/var/local ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true
         mv ${HOME_TMP}/usr/homedirs/home ${OTA_SYSROOT}/ || true
         # Ensure that /var/local exists (AGL symlinks /usr/local to /var/local)
         install -d ${OTA_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/local
diff --git a/recipes-support/libp11/libp11_0.4.7.bb b/recipes-support/libp11/libp11_0.4.9.bb
index 02d9e50..6d0165f 100644
--- a/recipes-support/libp11/libp11_0.4.7.bb
+++ b/recipes-support/libp11/libp11_0.4.9.bb
@@ -11,14 +11,14 @@ RDEPENDS_${PN} += " opensc"
 
 SRC_URI = "git://github.com/OpenSC/libp11.git \
            file://0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch"
-SRCREV = "da725ab727342083478150a203a3c80c4551feb4"
+SRCREV = "e1210903291b1de9eabcad26e740a4b2fbcca692"
 
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
 # Currently, Makefile dependencies are incorrectly defined which causes build errors
-# The number of jobs is high
+# if the number of jobs is high
 # See https://github.com/OpenSC/libp11/issues/94
 PARALLEL_MAKE = ""
 EXTRA_OECONF = "--disable-static"
@@ -28,12 +28,12 @@ do_install_append () {
     rm -rf ${D}${docdir}/${BPN}
 }
 
-FILES_${PN} = "${libdir}/engines/pkcs11.so \
-               ${libdir}/engines/libpkcs11${SOLIBS} \
+FILES_${PN} = "${libdir}/engines*/pkcs11.so \
+               ${libdir}/engines*/libpkcs11${SOLIBS} \
                ${libdir}/libp11${SOLIBS}"
 
 FILES_${PN}-dev = " \
-                   ${libdir}/engines/libpkcs11${SOLIBSDEV} \
+                   ${libdir}/engines*/libpkcs11${SOLIBSDEV} \
                    ${libdir}/libp11${SOLIBSDEV} \
                    ${libdir}/pkgconfig/libp11.pc \
                    /usr/include"