aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-11-05 12:58:03 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-11-05 12:58:03 +0100
commit583e5b6253dcca995d787b4e386bed558d7f6601 (patch)
tree0797810e75d02e13b82583152d0d04816df59f7a
parentab08d907b031db2785b561d7bff70f21eb899178 (diff)
Allow SRCREV handling through poky-agl.confeel_4.99.2eel/4.99.24.99.2
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>
-rw-r--r--meta-hmi-framework/recipes-demo-hmi/agl-service-homescreen-2017/agl-service-homescreen-2017_git.bb2
-rw-r--r--meta-hmi-framework/recipes-demo-hmi/homescreen-2017/homescreen-2017_git.bb2
-rw-r--r--meta-hmi-framework/recipes-graphics/agl-service-windowmanager-2017/agl-service-windowmanager-2017_git.bb2
-rw-r--r--meta-hmi-framework/recipes-graphics/libwindowmanager/libwindowmanager_git.bb2
-rw-r--r--meta-hmi-framework/recipes-multimedia/agl-service-soundmanager-2017/agl-service-soundmanager-2017_git.bb2
-rw-r--r--meta-hmi-framework/recipes-multimedia/libsoundmanager/libsoundmanager_git.bb2
6 files changed, 6 insertions, 6 deletions
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 548c62bf..4658fda5 100644
--- 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 a6927d08..c29956ae 100644
--- 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 972c99d2..3a11a2ef 100644
--- 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 b96f3f79..f0c9dc6d 100644
--- 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 13cd800c..9f9e5643 100644
--- 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 5bf325a3..e6943701 100644
--- 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"