Allow SRCREV handling through poky-agl.conf

This change simplifies the SRCREV handling by using
- AGL_APP_REVISION and AGL_DEFAULT_REVISION
in recipes.
Also the AGL_BRANCH can be used to switch to release branches.

Change-Id: Ia9e50ac6ffa8a46c1fa536c96adf740821db22af
Bug-AGL: SPEC-864
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/meta-hmi-framework/recipes-demo-hmi/agl-service-homescreen-2017/agl-service-homescreen-2017_git.bb b/meta-hmi-framework/recipes-demo-hmi/agl-service-homescreen-2017/agl-service-homescreen-2017_git.bb
index 548c62b..4658fda 100644 (file)
--- a/meta-hmi-framework/recipes-demo-hmi/agl-service-homescreen-2017/agl-service-homescreen-2017_git.bb
+++ b/meta-hmi-framework/recipes-demo-hmi/agl-service-homescreen-2017/agl-service-homescreen-2017_git.bb
@@ -9,6 +9,6 @@ DEPENDS = "dbus glib-2.0 af-binder json-c"
 
 inherit cmake aglwgt
 
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-homescreen-2017;protocol=https;branch=master"
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-homescreen-2017;protocol=https;branch=${AGL_BRANCH}"
 SRCREV = "599de8d3f35cb0fe56c7e27591862d61944b456b"
 S = "${WORKDIR}/git"

diff --git a/meta-hmi-framework/recipes-demo-hmi/homescreen-2017/homescreen-2017_git.bb b/meta-hmi-framework/recipes-demo-hmi/homescreen-2017/homescreen-2017_git.bb
index a6927d0..c29956a 100644 (file)
--- a/meta-hmi-framework/recipes-demo-hmi/homescreen-2017/homescreen-2017_git.bb
+++ b/meta-hmi-framework/recipes-demo-hmi/homescreen-2017/homescreen-2017_git.bb
@@ -18,7 +18,7 @@ DEPENDS = "\
 
 inherit qmake5 systemd pkgconfig aglwgt
 
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/homescreen-2017;protocol=https;branch=master"
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/homescreen-2017;protocol=https;branch=${AGL_BRANCH}"
 SRCREV  = "4940d001f08bec6fd68293efcbd6673a9ffce65e"
 S       = "${WORKDIR}/git/"
 

diff --git a/meta-hmi-framework/recipes-graphics/agl-service-windowmanager-2017/agl-service-windowmanager-2017_git.bb b/meta-hmi-framework/recipes-graphics/agl-service-windowmanager-2017/agl-service-windowmanager-2017_git.bb
index 972c99d..3a11a2e 100644 (file)
--- a/meta-hmi-framework/recipes-graphics/agl-service-windowmanager-2017/agl-service-windowmanager-2017_git.bb
+++ b/meta-hmi-framework/recipes-graphics/agl-service-windowmanager-2017/agl-service-windowmanager-2017_git.bb
@@ -14,7 +14,7 @@ DEPENDS = "af-binder json-c wayland wayland-ivi-extension wayland-native"
 
 inherit cmake aglwgt
 
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-windowmanager-2017;protocol=https;branch=master"
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-windowmanager-2017;protocol=https;branch=${AGL_BRANCH}"
 SRCREV = "afd5c59cdfeeb142feb57afe7d3d47f5f83fda45"
 S = "${WORKDIR}/git"
 

diff --git a/meta-hmi-framework/recipes-graphics/libwindowmanager/libwindowmanager_git.bb b/meta-hmi-framework/recipes-graphics/libwindowmanager/libwindowmanager_git.bb
index b96f3f7..f0c9dc6 100644 (file)
--- a/meta-hmi-framework/recipes-graphics/libwindowmanager/libwindowmanager_git.bb
+++ b/meta-hmi-framework/recipes-graphics/libwindowmanager/libwindowmanager_git.bb
@@ -9,6 +9,6 @@ RDEPENDS_${PN} = "agl-service-windowmanager-2017"
 
 inherit cmake
 
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/libwindowmanager.git;protocol=https;branch=master"
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/libwindowmanager.git;protocol=https;branch=${AGL_BRANCH}"
 SRCREV = "2d89ec62b5118a4a5b5834b636184271c53b2312"
 S = "${WORKDIR}/git"

diff --git a/meta-hmi-framework/recipes-multimedia/agl-service-soundmanager-2017/agl-service-soundmanager-2017_git.bb b/meta-hmi-framework/recipes-multimedia/agl-service-soundmanager-2017/agl-service-soundmanager-2017_git.bb
index 13cd800..9f9e564 100644 (file)
--- a/meta-hmi-framework/recipes-multimedia/agl-service-soundmanager-2017/agl-service-soundmanager-2017_git.bb
+++ b/meta-hmi-framework/recipes-multimedia/agl-service-soundmanager-2017/agl-service-soundmanager-2017_git.bb
@@ -14,6 +14,6 @@ RDEPENDS_${PN} = "audiomanager audiomanager-plugins"
 
 inherit cmake aglwgt
 
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-soundmanager-2017;protocol=https;branch=master"
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-soundmanager-2017;protocol=https;branch=${AGL_BRANCH}"
 SRCREV = "71e9700fe906fff4f111bc70d025912ee5dd095a"
 S = "${WORKDIR}/git"

diff --git a/meta-hmi-framework/recipes-multimedia/libsoundmanager/libsoundmanager_git.bb b/meta-hmi-framework/recipes-multimedia/libsoundmanager/libsoundmanager_git.bb
index 5bf325a..e694370 100644 (file)
--- a/meta-hmi-framework/recipes-multimedia/libsoundmanager/libsoundmanager_git.bb
+++ b/meta-hmi-framework/recipes-multimedia/libsoundmanager/libsoundmanager_git.bb
@@ -10,6 +10,6 @@ RDEPENDS_${PN} = "agl-service-soundmanager-2017"
 
 inherit cmake
 
-SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/libsoundmanager.git;protocol=https;branch=master"
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/staging/libsoundmanager.git;protocol=https;branch=${AGL_BRANCH}"
 SRCREV = "cda4a958e85d397bae142fbe6068a3e17d4aa935"
 S = "${WORKDIR}/git"