Uploaded image for project: ' AGL Development'
  1. AGL Development
  2. SPEC-2771

Streamline AGL_DEFAULT_IMAGE_FSTYPES

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Fixed
    • Icon: Major Major
    • None
    • None
    • None
    • None

      A review on what we use as Image targets currently:

      dl9pf@samweis:~/AGL/repobuild> repo grep AGL_DEFAULT_IMAGE_FSTYPES
      meta-agl/meta-agl-bsp/conf/include/agl_bbe.inc:AGL_DEFAULT_IMAGE_FSTYPES = "tar.xz wic.xz wic.bmap"
      meta-agl/meta-agl-distro/conf/distro/poky-agl.conf:AGL_DEFAULT_IMAGE_FSTYPES ?= "tar.xz ${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"
      meta-agl/meta-agl-distro/conf/distro/poky-agl.conf:IMAGE_FSTYPES := "${AGL_DEFAULT_IMAGE_FSTYPES} ${AGL_EXTRA_IMAGE_FSTYPES}"
      dl9pf@samweis:~/AGL/repobuild> repo grep AGL_EXTRA_IMAGE_FSTYPES
      meta-agl/meta-agl-bsp/conf/include/agl_beaglebone.inc:AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
      meta-agl/meta-agl-bsp/conf/include/agl_cubox-i.inc:AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
      meta-agl/meta-agl-bsp/conf/include/agl_cyclone5.inc:AGL_EXTRA_IMAGE_FSTYPES  = "wic.xz"
      meta-agl/meta-agl-bsp/conf/include/agl_dra7xx-evm.inc:AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
      meta-agl/meta-agl-bsp/conf/include/agl_hsdk.inc:AGL_EXTRA_IMAGE_FSTYPES = "wic.xz"
      meta-agl/meta-agl-bsp/conf/include/agl_imx6qdlsabreauto.inc:AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
      meta-agl/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc:AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
      meta-agl/meta-agl-bsp/conf/include/agl_nitrogen6x.inc:AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
      meta-agl/meta-agl-bsp/conf/include/agl_qemux86-64.inc:AGL_EXTRA_IMAGE_FSTYPES = "ext4 wic.vmdk"
      meta-agl/meta-agl-bsp/conf/include/agl_raspberrypi3.inc:AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
      meta-agl/meta-agl-bsp/conf/include/agl_ulcb-nogfx.inc:AGL_EXTRA_IMAGE_FSTYPES = "wic.xz wic.bmap wic.xz.sha256sum"
      meta-agl/meta-agl-distro/conf/distro/poky-agl.conf:AGL_EXTRA_IMAGE_FSTYPES ??= ""
      meta-agl/meta-agl-distro/conf/distro/poky-agl.conf:IMAGE_FSTYPES := "${AGL_DEFAULT_IMAGE_FSTYPES} ${AGL_EXTRA_IMAGE_FSTYPES}"
      meta-agl/meta-agl-profile-core/recipes-platform/images/agl-image-boot.inc:IMAGE_FSTYPES += "${AGL_EXTRA_IMAGE_FSTYPES}"
      meta-agl/meta-agl-profile-core/recipes-platform/images/agl-image-minimal.inc:IMAGE_FSTYPES += "${AGL_EXTRA_IMAGE_FSTYPES}"
      meta-agl/templates/base/99_local.conf.inc:#AGL_EXTRA_IMAGE_FSTYPES = ""
       

       

      TLDR ... wic.xz is the actual default.  I assume no one uses tar.xz on a daily basis. And only qemu* actually depends on ext4/ext4.xz .

       

      Thus we can streamline the defaults now to:
      AGL_DEFAULT_IMAGE_TYPES ?= "wic.xz wic.bmap wic.xz.sha256sum"

      AGL_DEFAULT_IMAGE_TYPES_qemuall ?= "${@bb.utils.contains('DISTRO_FEATURES', 'AGLCI', 'ext4.xz', 'ext4', d)}"

       

      And follow-through the machine includes to remove wic.xz there to reflect the new defaults.

       

      Goal: save space and time through less output formats.

        # Subject Branch Project Status CR V

            tmrini Thomas Rini
            jsmoeller Jan-Simon Moeller
            Votes:
            0 Vote for this issue
            Watchers:
            3 Start watching this issue

              Created:
              Updated:
              Resolved: