Re: [cip-dev] [isar-cip-core][PATCH] Update Isar revision

On Thu, 2026-08-13 at 09:07 +0200, Felix Moessbauer via lists.cip-
project.org wrote:
> By that, we also need to update the firmware deployment again, as the
> previous interface was incompatible with sstate in combination with
> hash equivalence.

Hmm... this breaks as our kernel source package is arch / machine
specific, which breaks the single-source rule.

We need to clarify if isar in general should append -${MACHINE} to the
kernel source package, or if this is a downstream problem.

For machine specific kernels that are anyways just built for a single
target, it does not matter. But here we build the same kernel under the
same name for multiple targets.

Felix

> 
> Signed-off-by: Felix Moessbauer <[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 5ed7ad2..4fcdec6 100644
> --- a/kas-cip.yml
> +++ b/kas-cip.yml
> @@ -22,7 +22,7 @@ repos:
>  
>    isar:
>      url: https://github.com/ilbers/isar.git
> -    commit: 481db3b2e8949336576e50a78aaf5d101f52c8d2
> +    commit: 86c761e45e446c01874c0a36394f8be1f7d938d3
>      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 9c2bece..3f51dc4 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 "${DEPLOYDIR}/${PN}_${PV}_${DISTRO_ARCH}.deb" | \
> +    dpkg --fsys-tarfile "${DEPLOY_DIR_DEB}/${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 7fcd144..e07342d 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 "${DEPLOYDIR}/trusted-firmware-a-${TF_A_NAME}_${PV}_${DISTRO_ARCH}.deb" | \
> +    dpkg --fsys-tarfile "${DEPLOY_DIR_DEB}/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 "${DEPLOYDIR}/trusted-firmware-a-${TF_A_NAME}_${PV}_${DISTRO_ARCH}.deb" | \
> +    dpkg --fsys-tarfile "${DEPLOY_DIR_DEB}/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 18f871b..c20787a 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 "${DEPLOYDIR}/u-boot-${MACHINE}_${PV}_${DISTRO_ARCH}.deb" | \
> +    dpkg --fsys-tarfile "${DEPLOY_DIR_DEB}/u-boot-${MACHINE}_${PV}_${DISTRO_ARCH}.deb" | \
>          tar xOf - "./usr/lib/u-boot/${MACHINE}/${U_BOOT_BIN}" \
>          > "${DEPLOYDIR_FIRMWARE}/firmware.bin"
>  }
> -- 
> 2.55.0