Remove sota-related includes from meta-agl-bsp

Bug-AGL: SPEC-557
Change-Id: Id126559e4114b191c923477e7dd04147cb1ec770
Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9257
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

diff --git a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
index 228774b..c31ac27 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
+++ b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc
@@ -23,5 +23,3 @@ IMAGE_INSTALL_append = " \
         libva \
         va-intel \
         gstreamer-vaapi-1.0 "
-
-include conf/include/local/sota_minnowboard.inc

diff --git a/meta-agl-bsp/conf/include/agl_porter-nogfx.inc b/meta-agl-bsp/conf/include/agl_porter-nogfx.inc
index f637208..63f5fb7 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_porter-nogfx.inc
+++ b/meta-agl-bsp/conf/include/agl_porter-nogfx.inc
@@ -18,5 +18,3 @@ UBOOT_MACHINE = "porter_vin_config"
 
 PREFERRED_PROVIDER_virtual/libgles2 = "mesa"
 PREFERRED_PROVIDER_virtual/egl = "mesa"
-
-include conf/include/local/sota_porter.inc

diff --git a/meta-agl-bsp/conf/include/agl_porter.inc b/meta-agl-bsp/conf/include/agl_porter.inc
index cac5be7..0edb8bb 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_porter.inc
+++ b/meta-agl-bsp/conf/include/agl_porter.inc
@@ -178,5 +178,3 @@ DISTRO_FEATURES_append = " h264avcenc_lib"
 #DISTRO_FEATURES_append = " aacsdec_mdw"
 # ARM AAC Encode Middleware for Linux
 #DISTRO_FEATURES_append = " aacenc_mdw"
-
-include conf/include/local/sota_porter.inc

diff --git a/meta-agl-bsp/conf/include/agl_qemux86-64.inc b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
index a9d320c..6ce1d25 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_qemux86-64.inc
+++ b/meta-agl-bsp/conf/include/agl_qemux86-64.inc
@@ -17,5 +17,3 @@ APPEND += "console=ttyS0,115200n8"
 #
 # All boot message will be off
 APPEND += "quiet"
-
-include conf/include/local/sota_qemux86-64.inc

diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc
index 2f700c0..bacd946 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc
+++ b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc
@@ -30,5 +30,3 @@ IMAGE_INSTALL_append = " kernel-modules linux-firmware "
 
 # Psplash causes crash on first boot on RPi
 IMAGE_FEATURES_remove = "splash"
-
-include conf/include/local/sota_raspberrypi.inc

diff --git a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
index 2f700c0..bacd946 100644 (file)
--- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
+++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc
@@ -30,5 +30,3 @@ IMAGE_INSTALL_append = " kernel-modules linux-firmware "
 
 # Psplash causes crash on first boot on RPi
 IMAGE_FEATURES_remove = "splash"
-
-include conf/include/local/sota_raspberrypi.inc

diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc
index 42ff6bc..29548ae 100644 (file)
--- a/templates/feature/agl-sota/50_local.conf.inc
+++ b/templates/feature/agl-sota/50_local.conf.inc
@@ -1,2 +1,2 @@
 #see meta-updater/conf/distro/sota.conf.inc
-require conf/distro/sota.conf.inc
+INHERIT += " sota"