aboutsummaryrefslogtreecommitdiffstats
path: root/meta-agl-distro/conf/distro
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/distro
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/distro')
-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