From: Scott Murray <scott.murray@konsulko.com>
Date: Tue, 25 Feb 2020 20:13:53 +0000 (-0500)
Subject: meta-agl-distro: remove next branch specific inc file
X-Git-Tag: 9.99.1~104
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F24125%2F1;p=AGL%2Fmeta-agl.git

meta-agl-distro: remove next branch specific inc file

Now that next has been merged into master and agl-service-gps has
been updated for zeus, remove the next branch specific inc file
that was being pulled into poky-agl.conf.

Bug-AGL: SPEC-2932

Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: If6570117e8f44afcace568c483cec71f9c3ea853
---

diff --git a/meta-agl-distro/conf/distro/poky-agl-next.inc b/meta-agl-distro/conf/distro/poky-agl-next.inc
deleted file mode 100644
index c5798aa55..000000000
--- a/meta-agl-distro/conf/distro/poky-agl-next.inc
+++ /dev/null
@@ -1 +0,0 @@
-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 26eca1d05..1a1ffe981 100644
--- a/meta-agl-distro/conf/distro/poky-agl.conf
+++ b/meta-agl-distro/conf/distro/poky-agl.conf
@@ -184,6 +184,3 @@ 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