diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-06-28 15:44:34 +0200 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2017-06-29 09:16:16 +0000 |
| commit | 74d0ccd5d67a88c68dd967c95d08b220ee4741b5 (patch) | |
| tree | 1007684b0fa9905ee02b3b9b0707ebc47b07cee7 /meta-agl-bsp | |
| parent | af694daf954deb0a5307a7ac0c3d2a79fb854492 (diff) | |
Fix rpi-sdimg after IMAGE_FSTYPE being enforced in poky-agl.conf
This changeset fixes the case of the rpi-sdimg which was broken
by the IMAGE_FSTYPE setting introduced in poky-agl.conf (distro-wide).
A new variable AGL_EXTRA_IMAGE_FSTYPES is available now and only used
in AGL (target) images.
Reasoning for this solution:
- any modifications to IMAGE_FSTYPES will also affect things like the initramfs or initrd images.
- we minimized the disk-space requirements by reusing the ext4.xz for the rpi-sdimg
Bug-AGL: SPEC-492
Change-Id: I07fd51dbcf334653cd6033b7ccb663c4d4ed8578
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9927
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Diffstat (limited to 'meta-agl-bsp')
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_raspberrypi2.inc | 5 | ||||
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc | 6 | ||||
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_raspberrypi3.inc | 5 |
3 files changed, 16 insertions, 0 deletions
diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc index 88565fd5a..2cd9ec2a9 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc @@ -33,3 +33,8 @@ IMAGE_FEATURES_remove = "splash" # Build updatable image. Only takes effect when sota.bbclass is inherited DISTRO_FEATURES_append = " sota" +# Add the custom rpi-sdimg output format +AGL_EXTRA_IMAGE_FSTYPES_append = " rpi-sdimg.xz" + +# Use the AGL default ext4.xz to generate the rpi-sdimg +SDIMG_ROOTFS_TYPE = "ext4.xz" diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc index d6fe5facb..cfa36afed 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi3-64.inc @@ -29,3 +29,9 @@ IMAGE_INSTALL_append = " kernel-modules linux-firmware " # Psplash causes crash on first boot on RPi IMAGE_FEATURES_remove = "splash" + +# Add the custom rpi-sdimg output format +AGL_EXTRA_IMAGE_FSTYPES_append = " rpi-sdimg.xz" + +# Use the AGL default ext4.xz to generate the rpi-sdimg +SDIMG_ROOTFS_TYPE = "ext4.xz" diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc index 88565fd5a..2cd9ec2a9 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc @@ -33,3 +33,8 @@ IMAGE_FEATURES_remove = "splash" # Build updatable image. Only takes effect when sota.bbclass is inherited DISTRO_FEATURES_append = " sota" +# Add the custom rpi-sdimg output format +AGL_EXTRA_IMAGE_FSTYPES_append = " rpi-sdimg.xz" + +# Use the AGL default ext4.xz to generate the rpi-sdimg +SDIMG_ROOTFS_TYPE = "ext4.xz" |