From 1c2105900332ae31a622131598780cf58c7028c3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan-Simon=20M=C3=B6ller?= Date: Thu, 7 Sep 2017 21:57:27 +0200 Subject: [PATCH] Make sure app recipes use the release versions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This change uses refs/tags/${DISTRO_BRANCH_VERSION_TAG} to make sure we end up with the tagged sources of the 4.0.1 release. The plain SRCREV is in sync and there as reference. Change-Id: I5427216eaeb044316d8b1b4e3c37c36dfcc10d01 Signed-off-by: Jan-Simon Möller --- recipes-demo-hmi/agl-service-bluetooth/agl-service-bluetooth_git.bb | 4 +++- recipes-demo-hmi/agl-service-wifi/agl-service-wifi_git.bb | 2 ++ recipes-demo-hmi/controls/controls_git.bb | 1 + recipes-demo-hmi/dashboard/dashboard_git.bb | 4 +++- recipes-demo-hmi/homescreen/homescreen_git.bb | 4 ++++ .../homescreenappframeworkbinderagl_git.bb | 3 +++ recipes-demo-hmi/hvac/hvac_git.bb | 4 +++- recipes-demo-hmi/inputeventmanager/inputeventmanager_git.bb | 6 +++++- recipes-demo-hmi/libhomescreen/libhomescreen_git.bb | 5 ++++- recipes-demo-hmi/mediaplayer/mediaplayer_git.bb | 4 +++- recipes-demo-hmi/mixer/mixer_git.bb | 4 +++- recipes-demo-hmi/phone/phone_git.bb | 2 ++ .../qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb | 3 +++ recipes-demo-hmi/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb | 2 ++ recipes-demo-hmi/radio/radio_git.bb | 1 + recipes-demo-hmi/settings/settings_git.bb | 2 ++ recipes-demo-hmi/unicens/unicens_0.1.bb | 4 +++- recipes-demo-hmi/vod-server/vod-server_0.1.bb | 4 +++- recipes-demo-hmi/windowmanager/windowmanager_git.bb | 5 ++++- recipes-kernel/mocca-usb/mocca-usb.bb | 4 +++- recipes-kernel/most/most.bb | 2 ++ 21 files changed, 59 insertions(+), 11 deletions(-) diff --git a/recipes-demo-hmi/agl-service-bluetooth/agl-service-bluetooth_git.bb b/recipes-demo-hmi/agl-service-bluetooth/agl-service-bluetooth_git.bb index 3c01b9dc6..aab57f026 100644 --- a/recipes-demo-hmi/agl-service-bluetooth/agl-service-bluetooth_git.bb +++ b/recipes-demo-hmi/agl-service-bluetooth/agl-service-bluetooth_git.bb @@ -7,7 +7,9 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-bluetooth;protocol=http;branch=dab" -SRCREV = "3587e397424285df38d28b1572ce9118724d5122" +SRCREV = "4e226ba5ad81c09dc62cd1c4295bd20fbd1d7711" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" + PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/recipes-demo-hmi/agl-service-wifi/agl-service-wifi_git.bb b/recipes-demo-hmi/agl-service-wifi/agl-service-wifi_git.bb index ee3a631a3..4f1969e2c 100644 --- a/recipes-demo-hmi/agl-service-wifi/agl-service-wifi_git.bb +++ b/recipes-demo-hmi/agl-service-wifi/agl-service-wifi_git.bb @@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-wifi;protocol=http;branch=dab" SRCREV = "603be14dd273e8110663e91d0cf7e9da438d1fe0" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" + PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/recipes-demo-hmi/controls/controls_git.bb b/recipes-demo-hmi/controls/controls_git.bb index cd599a066..c9ba3e3a5 100644 --- a/recipes-demo-hmi/controls/controls_git.bb +++ b/recipes-demo-hmi/controls/controls_git.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/controls;protocol=https;branch=dab" SRCREV = "b8d54a3e02cddf3bdd006a9285a4c899a08175d9" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/recipes-demo-hmi/dashboard/dashboard_git.bb b/recipes-demo-hmi/dashboard/dashboard_git.bb index 60c1e361e..1911f1b62 100644 --- a/recipes-demo-hmi/dashboard/dashboard_git.bb +++ b/recipes-demo-hmi/dashboard/dashboard_git.bb @@ -7,7 +7,9 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/dashboard;protocol=https;branch=dab" -SRCREV = "bb11bb4cf5f84ce3b28a127249be08b1b0be98df" +SRCREV = "bb11bb4cf5f84ce3b28a127249be08b1b0be98df" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" + PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/recipes-demo-hmi/homescreen/homescreen_git.bb b/recipes-demo-hmi/homescreen/homescreen_git.bb index 82e241c65..331a9306a 100644 --- a/recipes-demo-hmi/homescreen/homescreen_git.bb +++ b/recipes-demo-hmi/homescreen/homescreen_git.bb @@ -16,7 +16,11 @@ LIC_FILES_CHKSUM = "file://homescreen/LICENSE;md5=ae6497158920d9524cf208c09cc4c9 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/apps/homescreen.git;protocol=https;branch=dab \ file://dbus-homescreen.conf.in" + SRCREV = "b9889b160ecc43dcde07fe9d8a96373196c539ab" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" + + # PV needs to be modified with SRCPV to work AUTOREV correctly PV = "0.0+git${SRCPV}" diff --git a/recipes-demo-hmi/homescreenappframeworkbinderagl/homescreenappframeworkbinderagl_git.bb b/recipes-demo-hmi/homescreenappframeworkbinderagl/homescreenappframeworkbinderagl_git.bb index 97e9600bd..23e7c1f42 100644 --- a/recipes-demo-hmi/homescreenappframeworkbinderagl/homescreenappframeworkbinderagl_git.bb +++ b/recipes-demo-hmi/homescreenappframeworkbinderagl/homescreenappframeworkbinderagl_git.bb @@ -12,6 +12,9 @@ LIC_FILES_CHKSUM = "file://homescreenappframeworkbinderagl/LICENSE;md5=ae6497158 SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/src/homescreenappframeworkbinderagl.git;protocol=https;branch=dab" SRCREV = "33ef2deaf16b5de25041db8eaf3f97602026a501" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" + + # PV needs to be modified with SRCPV to work AUTOREV correctly PV = "0.0+git${SRCPV}" diff --git a/recipes-demo-hmi/hvac/hvac_git.bb b/recipes-demo-hmi/hvac/hvac_git.bb index 6d17a1dd4..acff6e8bd 100644 --- a/recipes-demo-hmi/hvac/hvac_git.bb +++ b/recipes-demo-hmi/hvac/hvac_git.bb @@ -7,7 +7,9 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/hvac;protocol=https;branch=dab" -SRCREV = "0d6f3ccbfdfe7947517879a1b034ba9cad8247f1" +SRCREV = "0d6f3ccbfdfe7947517879a1b034ba9cad8247f1" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" + PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/recipes-demo-hmi/inputeventmanager/inputeventmanager_git.bb b/recipes-demo-hmi/inputeventmanager/inputeventmanager_git.bb index ceda800a3..2b22e3bd0 100644 --- a/recipes-demo-hmi/inputeventmanager/inputeventmanager_git.bb +++ b/recipes-demo-hmi/inputeventmanager/inputeventmanager_git.bb @@ -11,7 +11,11 @@ DEPENDS = " qtbase " LIC_FILES_CHKSUM = "file://inputeventmanager/LICENSE;md5=ae6497158920d9524cf208c09cc4c984" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/src/inputeventmanager.git;protocol=https;branch=dab" -SRCREV = "b39053a5a8512a735ac154ddbd7dba3ceeadce3e" + +SRCREV = "b39053a5a8512a735ac154ddbd7dba3ceeadce3e" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" + + # PV needs to be modified with SRCPV to work AUTOREV correctly PV = "0.0+git${SRCPV}" diff --git a/recipes-demo-hmi/libhomescreen/libhomescreen_git.bb b/recipes-demo-hmi/libhomescreen/libhomescreen_git.bb index a25a739f4..e495bcb96 100644 --- a/recipes-demo-hmi/libhomescreen/libhomescreen_git.bb +++ b/recipes-demo-hmi/libhomescreen/libhomescreen_git.bb @@ -15,7 +15,10 @@ LIC_FILES_CHKSUM = "file://libhomescreen/LICENSE;md5=ae6497158920d9524cf208c09cc SRC_URI = "git://gerrit.automotivelinux.org/gerrit/p/src/libhomescreen.git;protocol=https;branch=dab \ file://homescreen.pc.in" -SRCREV = "adf78ab9e5d9b82e3462bc0d7f928bd2d7085c0e" + +SRCREV = "adf78ab9e5d9b82e3462bc0d7f928bd2d7085c0e" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" + # PV needs to be modified with SRCPV to work AUTOREV correctly PV = "0.0+git${SRCPV}" diff --git a/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb b/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb index 20b90130e..14d86cdf3 100644 --- a/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb +++ b/recipes-demo-hmi/mediaplayer/mediaplayer_git.bb @@ -7,7 +7,9 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/mediaplayer;protocol=https;branch=dab" -SRCREV = "71b6e40301a2e23edfeaea5c33187db14c4d8917" + +SRCREV = "fc2ca7417ce2eefb1a35f19872b181a0f600e99d" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/recipes-demo-hmi/mixer/mixer_git.bb b/recipes-demo-hmi/mixer/mixer_git.bb index 79509b51c..81fc5a4a7 100644 --- a/recipes-demo-hmi/mixer/mixer_git.bb +++ b/recipes-demo-hmi/mixer/mixer_git.bb @@ -7,7 +7,9 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/mixer;protocol=https;branch=dab" -SRCREV = "b6ea8b3afbd244dd7f56eeb9886fb108b58e3765" + +SRCREV = "b6ea8b3afbd244dd7f56eeb9886fb108b58e3765" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/recipes-demo-hmi/phone/phone_git.bb b/recipes-demo-hmi/phone/phone_git.bb index 1424ad490..557168fc2 100644 --- a/recipes-demo-hmi/phone/phone_git.bb +++ b/recipes-demo-hmi/phone/phone_git.bb @@ -7,7 +7,9 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/phone;protocol=https;branch=dab" + SRCREV = "8d587e0062c6d6373e7e2102423562391fcd14f2" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/recipes-demo-hmi/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb b/recipes-demo-hmi/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb index 4b585ff09..e79445651 100644 --- a/recipes-demo-hmi/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb +++ b/recipes-demo-hmi/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb @@ -7,6 +7,9 @@ DEPENDS = "qtquickcontrols2" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/qtquickcontrols2-agl-style;protocol=https;branch=dab" SRCREV = "79991c0b1d17e38ad6188ab5fcb4c5ebd94ad059" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" + + PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git/" diff --git a/recipes-demo-hmi/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb b/recipes-demo-hmi/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb index cedee34aa..ca3e798c9 100644 --- a/recipes-demo-hmi/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb +++ b/recipes-demo-hmi/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb @@ -7,6 +7,8 @@ DEPENDS = "qtquickcontrols2" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/qtquickcontrols2-agl;protocol=https;branch=dab" SRCREV = "99437bc7f2c41d534b2585650b01dc1683da857f" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" + PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git/" diff --git a/recipes-demo-hmi/radio/radio_git.bb b/recipes-demo-hmi/radio/radio_git.bb index a340a0a54..2d903d383 100644 --- a/recipes-demo-hmi/radio/radio_git.bb +++ b/recipes-demo-hmi/radio/radio_git.bb @@ -13,6 +13,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/radio;protocol=https;bra file://presets-FOSDEM.conf \ " SRCREV = "2f266ec84ecc46df1858dd170842fe20e427aa92" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/recipes-demo-hmi/settings/settings_git.bb b/recipes-demo-hmi/settings/settings_git.bb index 2816c537f..1bc4f6e8a 100644 --- a/recipes-demo-hmi/settings/settings_git.bb +++ b/recipes-demo-hmi/settings/settings_git.bb @@ -8,6 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ae6497158920d9524cf208c09cc4c984" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/settings;protocol=https;branch=dab" SRCREV = "32be14bbc8f05abaf7ef5cb3e96469afc193d1f0" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" + PV = "1.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/recipes-demo-hmi/unicens/unicens_0.1.bb b/recipes-demo-hmi/unicens/unicens_0.1.bb index 24b8e5c25..9a55dbd90 100644 --- a/recipes-demo-hmi/unicens/unicens_0.1.bb +++ b/recipes-demo-hmi/unicens/unicens_0.1.bb @@ -15,7 +15,9 @@ SRC_URI += "file://0001-Support-booting-by-systemd.patch \ S = "${WORKDIR}/git" SRCREV = "98de71566c669330284fb5c707b7f05abd893862" -PV = "0.1+git${SRCREV}" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" + +PV = "0.1+git${SRCPV}" do_install() { install -m 0755 -d ${D}/usr/AGL/most diff --git a/recipes-demo-hmi/vod-server/vod-server_0.1.bb b/recipes-demo-hmi/vod-server/vod-server_0.1.bb index 6779017fe..51d5ae5eb 100644 --- a/recipes-demo-hmi/vod-server/vod-server_0.1.bb +++ b/recipes-demo-hmi/vod-server/vod-server_0.1.bb @@ -11,7 +11,9 @@ SRC_URI += "file://0001-Fix-cross-compilation-with-yocto.patch \ S = "${WORKDIR}/git" SRCREV = "38a2c807b3128c5a84538334c6ba18fe95a55734" -PV = "0.1+git${SRCREV}" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" + +PV = "0.1+git${SRCPV}" do_install() { install -m 0755 -d ${D}${bindir} diff --git a/recipes-demo-hmi/windowmanager/windowmanager_git.bb b/recipes-demo-hmi/windowmanager/windowmanager_git.bb index dae0a0d7b..23ce61033 100644 --- a/recipes-demo-hmi/windowmanager/windowmanager_git.bb +++ b/recipes-demo-hmi/windowmanager/windowmanager_git.bb @@ -12,7 +12,10 @@ DEPENDS = " qtbase " DEPENDS += " wayland-ivi-extension " LIC_FILES_CHKSUM = "file://windowmanager/LICENSE;md5=ae6497158920d9524cf208c09cc4c984" -SRCREV = "b28064e1f04eac99995e1462771fb43b7bba8545" + +SRCREV = "6f4e56d960719a28cfbebddbc5eb052b5c9df08f" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" + # PV needs to be modified with SRCPV to work AUTOREV correctly PV = "0.0+git${SRCPV}" diff --git a/recipes-kernel/mocca-usb/mocca-usb.bb b/recipes-kernel/mocca-usb/mocca-usb.bb index 246f25be8..cbb0e5ca3 100644 --- a/recipes-kernel/mocca-usb/mocca-usb.bb +++ b/recipes-kernel/mocca-usb/mocca-usb.bb @@ -6,9 +6,11 @@ inherit module PV = "0.1" -SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/can-lin/;protocol=https" +SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/can-lin/;protocol=https;branch=dab" S = "${WORKDIR}/git/Usb-Driver" + SRCREV = "02ba272c0eb51b06160307b6cb71f91684772c8c" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" # The inherit of module.bbclass will automatically name module packages with # "kernel-module-" prefix as required by the oe-core build environment. diff --git a/recipes-kernel/most/most.bb b/recipes-kernel/most/most.bb index 62e851af1..ff3b6d8c8 100644 --- a/recipes-kernel/most/most.bb +++ b/recipes-kernel/most/most.bb @@ -12,6 +12,8 @@ SRC_URI_append_porter = " file://0001-aim-network-3.10.31-ltsi-backport.patch \ " S = "${WORKDIR}/git/driver" SRCREV = "c52aecbce20ccc47ee91a9bd33cf413772b3487a" +SRCREV_dab = "refs/tags/${DISTRO_BRANCH_VERSION_TAG}" + # The inherit of module.bbclass will automatically name module packages with # "kernel-module-" prefix as required by the oe-core build environment. -- 2.16.6