mbox series

[0/2] Rework deployment of image artifacts

Message ID 20260410132250.3320171-1-felix.moessbauer@siemens.com
Headers show
Series Rework deployment of image artifacts | expand

Message

Felix Moessbauer April 10, 2026, 1:22 p.m. UTC
As the changing of the DEPLOY_DIR_IMAGE has proven to be fundamentally
incompatible with custom initrd recipes, this patch was reverted,
re-introducing the do_copy_boot_files error on DTBs that are named
equally but belong to different mc targets.

This series mitigate the issue by keeping the layout of DEPLOY_DIR_IMAGE,
but prefixing the DTB_FILES with PN and DISTRO. These prefixes are
then stripped again during imaging.

Note, that the series has been CI tested against the "dtbdeploy" and "dev"
tags.

Best regards,
Felix Moessbauer
Siemens AG

Felix Moessbauer (2):
  Revert "meta: Deploy image build artifacts into distro- and
    image-specific subdirs"
  prefix DTB files with PN in deploy dir

 RECIPE-API-CHANGELOG.md                       | 84 +++----------------
 .../installer-add-rootfs.bbclass              |  9 +-
 meta/classes-recipe/image.bbclass             | 17 ++--
 .../imagetypes_container.bbclass              |  2 +-
 meta/classes-recipe/imagetypes_wic.bbclass    |  2 +-
 meta/conf/bitbake.conf                        |  3 +-
 .../wic/plugins/source/bootimg-efi-isar.py    |  3 +-
 .../plugins/source/isoimage-isohybrid-isar.py |  2 +-
 testsuite/cibase.py                           |  2 +-
 testsuite/citest.py                           |  7 +-
 testsuite/start_vm.py                         |  2 +-
 11 files changed, 36 insertions(+), 97 deletions(-)

Comments

Zhihang Wei April 10, 2026, 2:21 p.m. UTC | #1
On 4/10/26 15:22, Felix Moessbauer wrote:
> As the changing of the DEPLOY_DIR_IMAGE has proven to be fundamentally
> incompatible with custom initrd recipes, this patch was reverted,
> re-introducing the do_copy_boot_files error on DTBs that are named
> equally but belong to different mc targets.
>
> This series mitigate the issue by keeping the layout of DEPLOY_DIR_IMAGE,
> but prefixing the DTB_FILES with PN and DISTRO. These prefixes are
> then stripped again during imaging.
>
> Note, that the series has been CI tested against the "dtbdeploy" and "dev"
> tags.
>
> Best regards,
> Felix Moessbauer
> Siemens AG
>
> Felix Moessbauer (2):
>    Revert "meta: Deploy image build artifacts into distro- and
>      image-specific subdirs"
>    prefix DTB files with PN in deploy dir
>
>   RECIPE-API-CHANGELOG.md                       | 84 +++----------------
>   .../installer-add-rootfs.bbclass              |  9 +-
>   meta/classes-recipe/image.bbclass             | 17 ++--
>   .../imagetypes_container.bbclass              |  2 +-
>   meta/classes-recipe/imagetypes_wic.bbclass    |  2 +-
>   meta/conf/bitbake.conf                        |  3 +-
>   .../wic/plugins/source/bootimg-efi-isar.py    |  3 +-
>   .../plugins/source/isoimage-isohybrid-isar.py |  2 +-
>   testsuite/cibase.py                           |  2 +-
>   testsuite/citest.py                           |  7 +-
>   testsuite/start_vm.py                         |  2 +-
>   11 files changed, 36 insertions(+), 97 deletions(-)
>
This has passed the newly added 2 DTB deploy test cases. I'll put it on
full CI and get back to this next week.

Zhihang