summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2020-02-25 15:13:53 -0500
committerScott Murray <scott.murray@konsulko.com>2020-02-25 15:13:53 -0500
commitba2ad84525baaa11705fe64a25050ca583a4dbdd (patch)
tree4556be5ef097a2f066f48e1050dbbb4fa8571be1
parent8b63689440e09c9139280088f5b4f5a686c5d50f (diff)
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
-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, 0 insertions, 4 deletions
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