From 4af95fe9819cbfbdee201f2e68d9525b4737512d Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Thu, 8 Jun 2017 18:30:32 +0200 Subject: Enable SOTA for supported architectures SOTA was temporarily disabled becaused it caused build errors Change-Id: I57f1704c3cacf08cda6cb6a0fa4ec1fe0df305f3 Signed-off-by: Anton Gerasimov Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9657 Reviewed-by: Martin Kelly Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account Reviewed-by: Changhyeok Bae Reviewed-by: Leon Anavi Reviewed-by: Jan-Simon Moeller --- meta-agl-bsp/conf/include/agl_porter-nogfx.inc | 4 ++++ meta-agl-bsp/conf/include/agl_porter.inc | 3 +++ meta-agl-bsp/conf/include/agl_qemux86-64.inc | 4 ++++ meta-agl-bsp/conf/include/agl_raspberrypi2.inc | 4 ++++ meta-agl-bsp/conf/include/agl_raspberrypi3.inc | 4 ++++ meta-agl-distro/conf/distro/poky-agl.conf | 3 --- 6 files changed, 19 insertions(+), 3 deletions(-) diff --git a/meta-agl-bsp/conf/include/agl_porter-nogfx.inc b/meta-agl-bsp/conf/include/agl_porter-nogfx.inc index 63f5fb75c..cb7b4a560 100644 --- a/meta-agl-bsp/conf/include/agl_porter-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_porter-nogfx.inc @@ -18,3 +18,7 @@ UBOOT_MACHINE = "porter_vin_config" PREFERRED_PROVIDER_virtual/libgles2 = "mesa" PREFERRED_PROVIDER_virtual/egl = "mesa" + +# Build updatable image. Only takes effect when sota.bbclass is inherited +DISTRO_FEATURES_append = " sota" + diff --git a/meta-agl-bsp/conf/include/agl_porter.inc b/meta-agl-bsp/conf/include/agl_porter.inc index 0edb8bb4b..06dcb8e51 100644 --- a/meta-agl-bsp/conf/include/agl_porter.inc +++ b/meta-agl-bsp/conf/include/agl_porter.inc @@ -178,3 +178,6 @@ DISTRO_FEATURES_append = " h264avcenc_lib" #DISTRO_FEATURES_append = " aacsdec_mdw" # ARM AAC Encode Middleware for Linux #DISTRO_FEATURES_append = " aacenc_mdw" + +# Build updatable image. Only takes effect when sota.bbclass is inherited +DISTRO_FEATURES_append = " sota" diff --git a/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl-bsp/conf/include/agl_qemux86-64.inc index 6ce1d25d6..f058c6bfc 100644 --- a/meta-agl-bsp/conf/include/agl_qemux86-64.inc +++ b/meta-agl-bsp/conf/include/agl_qemux86-64.inc @@ -17,3 +17,7 @@ APPEND += "console=ttyS0,115200n8" # # All boot message will be off APPEND += "quiet" + +# Build updatable image. Only takes effect when sota.bbclass is inherited +DISTRO_FEATURES_append = " sota" + diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc index bacd94682..6b219750a 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc @@ -30,3 +30,7 @@ IMAGE_INSTALL_append = " kernel-modules linux-firmware " # Psplash causes crash on first boot on RPi IMAGE_FEATURES_remove = "splash" + +# Build updatable image. Only takes effect when sota.bbclass is inherited +DISTRO_FEATURES_append = " sota" + diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc index 66a62fd5c..23e71b6b4 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc @@ -29,3 +29,7 @@ IMAGE_INSTALL_append = " kernel-modules linux-firmware " # Psplash causes crash on first boot on RPi IMAGE_FEATURES_remove = "splash" + +# Build updatable image. Only takes effect when sota.bbclass is inherited +DISTRO_FEATURES_append = " sota" + diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf index a35442894..70dcb3f80 100644 --- a/meta-agl-distro/conf/distro/poky-agl.conf +++ b/meta-agl-distro/conf/distro/poky-agl.conf @@ -113,6 +113,3 @@ require conf/distro/include/${TARGET_ARCH}-tune.inc # - use 1G RAM by default QB_MEM ?= "-m 1024" -# temporary fix for meta-updater (to be removed 2017-05-01) -IMAGE_INSTALL_remove = "rvi-sota-client" - -- cgit 1.2.3-korg