From 3759dc5c2655b505247a3f9908d7621fd70dc7d9 Mon Sep 17 00:00:00 2001 From: Anton Gerasimov Date: Tue, 25 Apr 2017 12:06:46 +0200 Subject: Change require to include to unbreak builds without ag-sota feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug-AGL: SPEC-557 Bug-AGL: SPEC-558 Change-Id: I06e9dfc28adef4be0fcbe104c9458395dc8efa1d Signed-off-by: Anton Gerasimov Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9239 Reviewed-by: Stéphane Desneux Reviewed-by: Matt Ranostay Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- meta-agl-bsp/conf/include/agl_intel-corei7-64.inc | 2 +- meta-agl-bsp/conf/include/agl_porter-nogfx.inc | 2 +- meta-agl-bsp/conf/include/agl_porter.inc | 2 +- meta-agl-bsp/conf/include/agl_qemux86-64.inc | 2 +- meta-agl-bsp/conf/include/agl_raspberrypi2.inc | 2 +- meta-agl-bsp/conf/include/agl_raspberrypi3.inc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) 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 b79b436ac..228774b9e 100644 --- a/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc +++ b/meta-agl-bsp/conf/include/agl_intel-corei7-64.inc @@ -24,4 +24,4 @@ IMAGE_INSTALL_append = " \ va-intel \ gstreamer-vaapi-1.0 " -require conf/include/local/sota_minnowboard.inc +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 37ff7837d..f6372081a 100644 --- a/meta-agl-bsp/conf/include/agl_porter-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_porter-nogfx.inc @@ -19,4 +19,4 @@ UBOOT_MACHINE = "porter_vin_config" PREFERRED_PROVIDER_virtual/libgles2 = "mesa" PREFERRED_PROVIDER_virtual/egl = "mesa" -require conf/include/local/sota_porter.inc +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 01ee3e414..cac5be7d4 100644 --- a/meta-agl-bsp/conf/include/agl_porter.inc +++ b/meta-agl-bsp/conf/include/agl_porter.inc @@ -179,4 +179,4 @@ DISTRO_FEATURES_append = " h264avcenc_lib" # ARM AAC Encode Middleware for Linux #DISTRO_FEATURES_append = " aacenc_mdw" -require conf/include/local/sota_porter.inc +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 341e9ad74..a9d320c9d 100644 --- a/meta-agl-bsp/conf/include/agl_qemux86-64.inc +++ b/meta-agl-bsp/conf/include/agl_qemux86-64.inc @@ -18,4 +18,4 @@ APPEND += "console=ttyS0,115200n8" # All boot message will be off APPEND += "quiet" -require conf/include/local/sota_qemux86-64.inc +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 da4a02a5e..66a064420 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi2.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi2.inc @@ -30,4 +30,4 @@ IMAGE_INSTALL_append = " kernel-modules linux-firmware " # Psplash causes crash on first boot on RPi IMAGE_FEATURES_remove = "splash" -require conf/include/local/sota_raspberrypi.inc +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 da4a02a5e..66a064420 100644 --- a/meta-agl-bsp/conf/include/agl_raspberrypi3.inc +++ b/meta-agl-bsp/conf/include/agl_raspberrypi3.inc @@ -30,4 +30,4 @@ IMAGE_INSTALL_append = " kernel-modules linux-firmware " # Psplash causes crash on first boot on RPi IMAGE_FEATURES_remove = "splash" -require conf/include/local/sota_raspberrypi.inc +include conf/include/local/sota_raspberrypi.inc -- cgit 1.2.3-korg