X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl%2Fconf%2Fdistro%2Fpoky-agl.conf;h=e9f5a1c2c0950a9ab194cacf07c1c83fbb0f501f;hb=a1e6f20828d629a6e08286fed5e8cfba0862948e;hp=65248d0bfb7ba3cfb84ea7b7b8c65b674baec849;hpb=47e9e46cea8dd91b43f3f01605f0c165e3ea34e4;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl/conf/distro/poky-agl.conf b/meta-agl/conf/distro/poky-agl.conf
index 65248d0bf..e9f5a1c2c 100644
--- a/meta-agl/conf/distro/poky-agl.conf
+++ b/meta-agl/conf/distro/poky-agl.conf
@@ -17,6 +17,9 @@ PREFERRED_PROVIDER_udev-utils ?= "systemd"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 VIRTUAL-RUNTIME_initscripts = ""
 
+# network manager to use (possible values: systemd, connman)
+VIRTUAL-RUNTIME_net_manager = "connman" 
+
 # Override these in poky based distros
 AGL_DEFAULT_DISTRO_FEATURES = "systemd opengl wayland pam bluetooth bluez5"
 AGL_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
@@ -28,13 +31,13 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${AGL_DEF
 DISTRO_FEATURES_remove = "x11"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
 
-PREFERRED_VERSION_linux-yocto ?= "3.14%"
-PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.14%"
-PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.14%"
-PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.14%"
-PREFERRED_VERSION_linux-yocto_qemumips ?= "3.14%"
-PREFERRED_VERSION_linux-yocto_qemumips64 ?= "3.14%"
-PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.14%"
+PREFERRED_VERSION_linux-yocto ?= "4.1%"
+PREFERRED_VERSION_linux-yocto_qemux86 ?= "4.1%"
+PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "4.1%"
+PREFERRED_VERSION_linux-yocto_qemuarm ?= "4.1%"
+PREFERRED_VERSION_linux-yocto_qemumips ?= "4.1%"
+PREFERRED_VERSION_linux-yocto_qemumips64 ?= "4.1%"
+PREFERRED_VERSION_linux-yocto_qemuppc ?= "4.1%"
 
 # Prefer GStreamer 1.4.x by default
 PREFERRED_VERSION_gstreamer1.0              ?= "1.4.%"
@@ -127,3 +130,10 @@ WARN_TO_ERROR_QA = "already-stripped compile-host-path install-host-path \
                     useless-rpaths"
 WARN_QA_remove = "${WARN_TO_ERROR_QA}"
 ERROR_QA_append = " ${WARN_TO_ERROR_QA}"
+
+# using multiple BSP layers causes dangling bbappends in meta-agl-bsp
+# turn it into a warning
+BB_DANGLINGAPPENDS_WARNONLY = "1"
+
+# enforce security-related compiler flags by default
+require conf/distro/include/security_flags.inc