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 (file)
index c5798aa..0000000
--- 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 26eca1d..1a1ffe9 100644 (file)
--- 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