summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2021-02-24 18:21:49 -0500
committerScott Murray <scott.murray@konsulko.com>2021-02-24 18:21:49 -0500
commit74842711af32e3a7c2267f3464d2e0c4866204b4 (patch)
tree03a7ece57bc03a8a1c0f873b032373d19f4ef886
parentbff669bb4e3b44de3c860a758cbce0830cc8a47c (diff)
meta-agl-core: use next branch for weston dependent packagesnext
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
-rw-r--r--meta-agl-core/conf/distro/poky-agl.conf3
-rw-r--r--meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb2
-rw-r--r--meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb2
3 files changed, 7 insertions, 0 deletions
diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf
index bea800b..78ab6d1 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 e3f0e26..f8e3284 100644
--- a/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb
+++ b/meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb
@@ -12,7 +12,9 @@ DEPENDS = "wayland wayland-protocols wayland-native weston \
${@bb.utils.contains('AGL_FEATURES', 'waltham-remoting', 'waltham waltham-transmitter-plugin', '', d)}"
SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/agl-compositor.git;protocol=https;branch=${AGL_BRANCH}"
+AGL_BRANCH_aglnext = "next"
SRCREV = "fd860492da6fb07f06b308805e6fc57afa76b186"
+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 aed96de..9f3e941 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"