diff options
| author |   Anton Gerasimov <anton@advancedtelematic.com> | 2016-11-04 12:08:46 +0100 |
|---|---|---|
| committer | Anton Gerasimov <anton@advancedtelematic.com> | 2016-11-04 12:08:46 +0100 |
| commit | 3e6e8c0097413de31ca89182969f1a2352947350 (patch) | |
| tree | b06830ae526a852b900c9d2a5df951a9fe74280e /templates | |
| parent | 19aa2eca0c838d4270f7a990c8f95589c5c2ed78 (diff) | |
Add u-boot image class when sota feature is enabled
Change-Id: I7ad6fc95f4252424ded09bc1d6d5ab18bf6733fd
Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/machine/porter-nogfx/50_local.conf.inc | 8 | ||||
| -rw-r--r-- | templates/machine/porter/50_local.conf.inc | 3 | ||||
| -rw-r--r-- | templates/machine/raspberrypi2/50_local.conf.inc | 2 | ||||
| -rw-r--r-- | templates/machine/raspberrypi3/50_local.conf.inc | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/templates/machine/porter-nogfx/50_local.conf.inc b/templates/machine/porter-nogfx/50_local.conf.inc index 63f5fb75c..6bc517191 100644 --- a/templates/machine/porter-nogfx/50_local.conf.inc +++ b/templates/machine/porter-nogfx/50_local.conf.inc @@ -18,3 +18,11 @@ UBOOT_MACHINE = "porter_vin_config" PREFERRED_PROVIDER_virtual/libgles2 = "mesa" PREFERRED_PROVIDER_virtual/egl = "mesa" + +# Commit united image to OSTree, not just uImage +OSTREE_KERNEL = "uImage+dtb" + +# OTA-enabled live image +IMAGE_CLASSES_append_sota = " image_types_uboot sdcard_image-porter-ota" +IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'porter-sdimg-ota ', '', d)}" + diff --git a/templates/machine/porter/50_local.conf.inc b/templates/machine/porter/50_local.conf.inc index a0452973e..7cae49299 100644 --- a/templates/machine/porter/50_local.conf.inc +++ b/templates/machine/porter/50_local.conf.inc @@ -189,5 +189,6 @@ DISTRO_FEATURES_append = " h264avcenc_lib" OSTREE_KERNEL = "uImage+dtb" # OTA-enabled live image -IMAGE_CLASSES_append_sota = " sdcard_image-porter-ota" +IMAGE_CLASSES_append_sota = " image_types_uboot sdcard_image-porter-ota" IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'porter-sdimg-ota ', '', d)}" + diff --git a/templates/machine/raspberrypi2/50_local.conf.inc b/templates/machine/raspberrypi2/50_local.conf.inc index 827fa052c..5b75257f0 100644 --- a/templates/machine/raspberrypi2/50_local.conf.inc +++ b/templates/machine/raspberrypi2/50_local.conf.inc @@ -7,7 +7,7 @@ CORE_IMAGE_EXTRA_INSTALL += "wayland weston" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" IMAGE_CLASSES += "sdcard_image-rpi-gdp" IMAGE_FSTYPES += "tar.bz2 ext3 rpi-sdimg" -IMAGE_CLASSES_append_sota = " sdcard_image-rpi-ota" +IMAGE_CLASSES_append_sota = " image_types_uboot sdcard_image-rpi-ota" IMAGE_CLASSES_remove_sota = " sdcard_image-rpi-gdp" IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'rpi-sdimg-ota', '', d)}" IMAGE_FSTYPES_remove_sota = "rpi-sdimg" diff --git a/templates/machine/raspberrypi3/50_local.conf.inc b/templates/machine/raspberrypi3/50_local.conf.inc index 466886938..5309411a8 100644 --- a/templates/machine/raspberrypi3/50_local.conf.inc +++ b/templates/machine/raspberrypi3/50_local.conf.inc @@ -7,7 +7,7 @@ CORE_IMAGE_EXTRA_INSTALL += "wayland weston" MULTI_PROVIDER_WHITELIST += "virtual/libgl virtual/egl virtual/libgles1 virtual/libgles2" IMAGE_CLASSES += "sdcard_image-rpi-gdp" IMAGE_FSTYPES += "tar.bz2 ext3 rpi-sdimg" -IMAGE_CLASSES_append_sota = " sdcard_image-rpi-ota" +IMAGE_CLASSES_append_sota = " image_types_uboot sdcard_image-rpi-ota" IMAGE_CLASSES_remove_sota = " sdcard_image-rpi-gdp" IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'agl-ota', 'rpi-sdimg-ota ', '', d)}" IMAGE_FSTYPES_remove_sota = "rpi-sdimg" |