summaryrefslogtreecommitdiffstats
path: root/meta-agl-distro/conf
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-01-27 14:10:56 -0500
committerScott Murray <scott.murray@konsulko.com>2020-01-27 14:10:56 -0500
commit8db438e38e573ac00da14197a905d86b43afea9b (patch)
tree43177b2ab7d3e9b60549e3caa0bb8591c0327a0b /meta-agl-distro/conf
parentbf92856329c2daf31bbbd831032ca57ba594e294 (diff)
meta-agl-distro: Add inc file for next branch over-rides
Add poky-agl-next.inc file to hold temporary next branch over-rides, and include it in poky-agl.conf. For now it just over-rides the AGL_BRANCH value for agl-service-gps to use the next branch. This can be removed once the next branches containing zeus support are merged into master. Bug-AGL: SPEC-2932 Change-Id: Id73597c6f35010e4e5f9b54ac09728c7783b9e2f Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Diffstat (limited to 'meta-agl-distro/conf')
-rw-r--r--meta-agl-distro/conf/distro/poky-agl-next.inc1
-rw-r--r--meta-agl-distro/conf/distro/poky-agl.conf3
2 files changed, 4 insertions, 0 deletions
diff --git a/meta-agl-distro/conf/distro/poky-agl-next.inc b/meta-agl-distro/conf/distro/poky-agl-next.inc
new file mode 100644
index 000000000..c5798aa55
--- /dev/null
+++ b/meta-agl-distro/conf/distro/poky-agl-next.inc
@@ -0,0 +1 @@
+AGL_BRANCH_pn-agl-service-gps = "next"
diff --git a/meta-agl-distro/conf/distro/poky-agl.conf b/meta-agl-distro/conf/distro/poky-agl.conf
index 81d2122ed..8ea3ea23b 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -184,3 +184,6 @@ PREFERRED_RPROVIDER_virtual/low-can-dev-mapping ?= "dev-mapping"
# support. Not having it is not an issue, since there is also explicit
# enabling of required security features done by meta-agl/meta-security.
BBMASK += "meta-security/recipes-kernel/linux/linux-%_5.%.bbappend"
+
+# Temporarily pull in some next branch specific over-rides
+include poky-agl-next.inc
00DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ } 
## Introduction

The `meta-agl-devel` layer contains components that are being tested or
still in development.
The layer also contains software packages that Original Equipment
Manufacturers (OEMs) need but are not included in the AGL software.

## Sub-Layers

The `meta-agl-devel` layer contains the following files and sub-layers:

```
.
├── docs
├── LICENSE
├── LICENSE.GPL-2.0-only
├── LICENSE.MIT
├── meta-agl-devel.md
├── meta-agl-jailhouse
├── meta-agl-lxc
├── meta-agl-ros2
├── meta-oem-production-readiness
├── meta-speech-framework
├── README.md
└── templates
```

The following list provides a summary of these sub-layers:

* `meta-speech-framework`: Provides libraries and software packages needed by
  for speech recognition.

* `meta-agl-jailhouse`: Provides Jailhouse partitioning hypervisor and
  supporting packages.

* `meta-agl-lxc`: Provides LXC container support and example images.

* `meta-agl-ros2`: Provides ROS2 and additional YDLIDAR support.

* `meta-oem-production-readiness`: Provides libraries and software packages of
  IVI product readiness

* `meta-agl-flutter`: Provides Flutter support.

* `templates`: Feature templates that support the `meta-agl-devel` layer.