[isar-cip-core][PATCH] Update Isar revision

From: Jan Kiszka <[email protected]>

Brings a couple of fixes for the new rootless mode.

This requires adjustments of the deploy_firmware tasks because .deb
files are deployed differently now.

Signed-off-by: Jan Kiszka <[email protected]>
---
 kas-cip.yml                                                   | 2 +-
 recipes-bsp/opensbi/opensbi-qemu-riscv64_1.7.bb               | 2 +-
 .../trusted-firmware-a-qemu-arm64_2.13.0.bb                   | 4 ++--
 recipes-bsp/u-boot/u-boot-qemu-common.inc                     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kas-cip.yml b/kas-cip.yml
index eb267165..f43da61f 100644
--- a/kas-cip.yml
+++ b/kas-cip.yml
@@ -22,7 +22,7 @@ repos:
 
   isar:
     url: https://github.com/ilbers/isar.git
-    commit: ea319eb835aea545f23266ba15358bad029a56a0
+    commit: 8ae7612dbc72607825e3efce6c3f8eef66200f2d
     layers:
       meta:
 
diff --git a/recipes-bsp/opensbi/opensbi-qemu-riscv64_1.7.bb b/recipes-bsp/opensbi/opensbi-qemu-riscv64_1.7.bb
index 6e3f2497..9c2becec 100644
--- a/recipes-bsp/opensbi/opensbi-qemu-riscv64_1.7.bb
+++ b/recipes-bsp/opensbi/opensbi-qemu-riscv64_1.7.bb
@@ -14,7 +14,7 @@ OPENSBI_BIN = "fw_payload.bin"
 OPENSBI_EXTRA_BUILDARGS = "FW_PAYLOAD_PATH=/usr/lib/u-boot/qemu-riscv64/u-boot.bin"
 
 do_deploy_firmware() {
-    dpkg --fsys-tarfile "${WORKDIR}/${PN}_${PV}_${DISTRO_ARCH}.deb" | \
+    dpkg --fsys-tarfile "${DEPLOYDIR}/${PN}_${PV}_${DISTRO_ARCH}.deb" | \
         tar xOf - "./usr/lib/opensbi/${MACHINE}/${OPENSBI_BIN}" \
         > "${DEPLOYDIR_FIRMWARE}/${OPENSBI_BIN}"
 }
diff --git a/recipes-bsp/trusted-firmware-a/trusted-firmware-a-qemu-arm64_2.13.0.bb b/recipes-bsp/trusted-firmware-a/trusted-firmware-a-qemu-arm64_2.13.0.bb
index 4786f349..7fcd1440 100644
--- a/recipes-bsp/trusted-firmware-a/trusted-firmware-a-qemu-arm64_2.13.0.bb
+++ b/recipes-bsp/trusted-firmware-a/trusted-firmware-a-qemu-arm64_2.13.0.bb
@@ -32,10 +32,10 @@ TF_A_EXTRA_BUILDARGS = " \
 TF_A_BINARIES = "release/bl1.bin release/fip.bin"
 
 do_deploy_firmware() {
-    dpkg --fsys-tarfile "${WORKDIR}/trusted-firmware-a-${TF_A_NAME}_${PV}_${DISTRO_ARCH}.deb" | \
+    dpkg --fsys-tarfile "${DEPLOYDIR}/trusted-firmware-a-${TF_A_NAME}_${PV}_${DISTRO_ARCH}.deb" | \
         tar xOf - "./usr/lib/trusted-firmware-a/${TF_A_NAME}/bl1.bin" \
         > "${DEPLOYDIR_FIRMWARE}/firmware.bin"
-    dpkg --fsys-tarfile "${WORKDIR}/trusted-firmware-a-${TF_A_NAME}_${PV}_${DISTRO_ARCH}.deb" | \
+    dpkg --fsys-tarfile "${DEPLOYDIR}/trusted-firmware-a-${TF_A_NAME}_${PV}_${DISTRO_ARCH}.deb" | \
         tar xOf - "./usr/lib/trusted-firmware-a/${TF_A_NAME}/fip.bin" | \
         dd of="${DEPLOYDIR_FIRMWARE}/firmware.bin" seek=64 bs=4096 conv=notrunc
 }
diff --git a/recipes-bsp/u-boot/u-boot-qemu-common.inc b/recipes-bsp/u-boot/u-boot-qemu-common.inc
index b63e878c..18f871b2 100644
--- a/recipes-bsp/u-boot/u-boot-qemu-common.inc
+++ b/recipes-bsp/u-boot/u-boot-qemu-common.inc
@@ -26,7 +26,7 @@ python() {
 }
 
 do_deploy_firmware() {
-    dpkg --fsys-tarfile "${WORKDIR}/u-boot-${MACHINE}_${PV}_${DISTRO_ARCH}.deb" | \
+    dpkg --fsys-tarfile "${DEPLOYDIR}/u-boot-${MACHINE}_${PV}_${DISTRO_ARCH}.deb" | \
         tar xOf - "./usr/lib/u-boot/${MACHINE}/${U_BOOT_BIN}" \
         > "${DEPLOYDIR_FIRMWARE}/firmware.bin"
 }
-- 
2.47.3