From 8543843eeb47fa9b45786d3e09bf497fcd5f95e0 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 28 Apr 2022 11:11:56 -0400 Subject: meta-agl-core: switch next branch users back to master Remove the aglnext override that was added on the next branch to switch the couple of affected libweston users (agl-compositor and waltham-transmitter-plugin) to forked next branches for handling Weston 9.0 and 10.0 changes. Now that those changes have been merged to the master branches in the respective repositories, this is no longer required. As well, bump the SRCREVs to pick up the Weston update changes. Bug-AGL: SPEC-4343 Signed-off-by: Scott Murray Change-Id: I7a4598a9e776aefa3ec7b2bf13b2e89c086c0681 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/27418 --- meta-agl-core/conf/distro/poky-agl.conf | 3 --- meta-agl-core/recipes-graphics/wayland/agl-compositor_git.bb | 2 +- meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf index 5903e59df..94bd4ccd5 100644 --- a/meta-agl-core/conf/distro/poky-agl.conf +++ b/meta-agl-core/conf/distro/poky-agl.conf @@ -26,9 +26,6 @@ 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: # Set the desired timestamps export SOURCE_DATE_EPOCH = "1593400000" 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 6aa169a4e..4ecc81f60 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,7 @@ 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}" -SRCREV = "cec4cf8fe409cae5618e81e4a3b6dd11cc8b2aa9" +SRCREV = "a02c5606aa6621c9d3e0cc968180e7993201e2da" AGL_BRANCH:aglnext = "next" SRCREV:aglnext = "${AUTOREV}" 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 36a141ac0..734fadf6f 100644 --- a/meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb +++ b/meta-agl-core/recipes-graphics/wayland/waltham-transmitter-plugin.bb @@ -8,7 +8,7 @@ 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 = "d64b99a999fcc17322393782fe802122fd963ced" SRCREV:aglnext = "${AUTOREV}" S = "${WORKDIR}/git" -- cgit 1.2.3-korg