From: Scott Murray <scott.murray@konsulko.com>
Date: Wed, 24 Feb 2021 23:21:49 +0000 (-0500)
Subject: meta-agl-core: use next branch for weston dependent packages
X-Git-Tag: 13.91.0~68
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=79e2730b6a64aa4acbf0b78e805b945960f3d47c;p=AGL%2Fmeta-agl.git

meta-agl-core: use next branch for weston dependent packages

Add a "aglnext" OVERRIDE in the distro configuration, and use it
to select the "next" branches in the agl-compositor and
waltham-transmitter-plugin recipes, and use AUTOREV for their
SRCREV.  The latter will allow rebasing the next branches in
those repositories as next branch updates occur without requiring
SRCREV updates every time.

Bug-AGL: SPEC-3819

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

diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf
index 9fcbdf7b2..b456783ee 100644
--- a/meta-agl-core/conf/distro/poky-agl.conf
+++ b/meta-agl-core/conf/distro/poky-agl.conf
@@ -26,6 +26,9 @@ DISTRO_BRANCH_VERSION_TAG = "${DISTRO_CODENAME}/${@'${DISTRO_VERSION}'.replace('
 AGL_APP_REVISION:aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
 AGL_DEFAULT_REVISION:aglrelease := "refs/tags/${DISTRO_BRANCH_VERSION_TAG}"
 
+#for next branch development
+OVERRIDES .= ":aglnext"
+
 # reproducible builds:
 # enable the flag
 BUILD_REPRODUCIBLE_BINARIES = "1"
diff --git a/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb b/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb
index eff1a89ff..6aa169a4e 100644
--- a/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb
+++ b/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb
@@ -13,6 +13,8 @@ DEPENDS = "wayland wayland-protocols wayland-native weston \
 
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/agl-compositor.git;protocol=https;branch=${AGL_BRANCH}"
 SRCREV = "cec4cf8fe409cae5618e81e4a3b6dd11cc8b2aa9"
+AGL_BRANCH:aglnext = "next"
+SRCREV:aglnext = "${AUTOREV}"
 
 PV = "0.0.10+git${SRCPV}"
 S = "${WORKDIR}/git"
diff --git a/meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb b/meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb
index 466985f41..36a141ac0 100644
--- a/meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb
+++ b/meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb
@@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f21c9af4de068fb53b83f0b37d262ec3"
 DEPENDS += "wayland wayland-native waltham weston"
 
 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/waltham-transmitter-plugin.git;protocol=https;branch=${AGL_BRANCH}"
+AGL_BRANCH:aglnext = "next"
 SRCREV = "c9d23a045e6cb46c023c15f8189ef3ee8b1ddf20"
+SRCREV:aglnext = "${AUTOREV}"
 
 S = "${WORKDIR}/git"