aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2019-09-17 08:10:47 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2019-09-18 09:33:54 +0300
commita4e6a0bda2dfe3e6bc66ebb73618ab67964a7d6b (patch)
tree24422daec73dee738e61f494f9c2a8c08896d1a8
parent609da75925987786f979799f682d4b4e272fb4d6 (diff)
boundary: update to warrior
Change-Id: I922417c04a07b47b37b514192f60805fef5db16b Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--meta-boot2qt-distro/conf/distro/include/boundary.inc3
-rw-r--r--meta-fsl-extras/conf/layer.conf3
2 files changed, 5 insertions, 1 deletions
diff --git a/meta-boot2qt-distro/conf/distro/include/boundary.inc b/meta-boot2qt-distro/conf/distro/include/boundary.inc
index a36776f2..d3075a6c 100644
--- a/meta-boot2qt-distro/conf/distro/include/boundary.inc
+++ b/meta-boot2qt-distro/conf/distro/include/boundary.inc
@@ -1,6 +1,6 @@
############################################################################
##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
## Contact: https://www.qt.io/licensing/
##
## This file is part of the Boot to Qt meta layer.
@@ -32,6 +32,7 @@ include conf/distro/include/fsl.inc
BBMASK += " \
meta-boundary/recipes-core/init-ifupdown \
meta-boundary/recipes-boundary/images \
+ meta-boundary/recipes-graphics/xorg-xserver \
"
MACHINE_EXTRA_INSTALL += "\
diff --git a/meta-fsl-extras/conf/layer.conf b/meta-fsl-extras/conf/layer.conf
index 306d569d..5a76c9c1 100644
--- a/meta-fsl-extras/conf/layer.conf
+++ b/meta-fsl-extras/conf/layer.conf
@@ -44,3 +44,6 @@ LAYERSERIES_COMPAT_b2qt_fsl = "warrior"
# override meta-fsl-bsp-release layers COMPATs
LAYERSERIES_COMPAT_fsl-bsp-release = "warrior"
LAYERSERIES_COMPAT_fsl-sdk-release = "warrior"
+
+# override meta-boundary layer COMPATs
+LAYERSERIES_COMPAT_boundary-layer = "warrior"