From: Scott Murray Date: Mon, 27 Jan 2020 19:10:56 +0000 (-0500) Subject: meta-agl-distro: Add inc file for next branch over-rides X-Git-Tag: 9.99.1~106^2~15 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F23685%2F1;p=AGL%2Fmeta-agl.git 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 --- 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