From 0cf70c4f4fa11154d0f894c67c776ede0b09c0a9 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Thu, 21 Jul 2022 13:08:33 +0200 Subject: [PATCH] Remove usage of AGL_APP_REVISION The floating AGL_APP_REVISION leads to more rebuilds than necessary. Replace it with a fixed SRCREV. This is recommended by upstream YP. Bug-AGL: SPEC-4481 Signed-off-by: Jan-Simon Moeller Change-Id: I447f2c9a4a90867ac6e7971fd4bb89252938390b --- recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb | 2 +- recipes-demo/agl-service-hvac/agl-service-hvac_git.bb | 2 +- recipes-demo/camera-gstreamer/camera-gstreamer_git.bb | 2 +- recipes-demo/cluster-dashboard/cluster-dashboard_git.bb | 2 +- .../cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb | 2 +- recipes-demo/cluster-receiver/cluster-receiver_git.bb | 2 +- recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb | 2 +- recipes-demo/dashboard/dashboard_git.bb | 2 +- recipes-demo/homescreen/homescreen_git.bb | 2 +- recipes-demo/hvac/hvac_git.bb | 2 +- recipes-demo/launcher/launcher_git.bb | 2 +- recipes-demo/mediaplayer/mediaplayer_git.bb | 2 +- recipes-demo/messaging/messaging_git.bb | 2 +- recipes-demo/navigation/ondemandnavi_git.bb | 2 +- recipes-demo/navigation/tbtnavi_git.bb | 2 +- recipes-demo/phone/phone_git.bb | 2 +- recipes-demo/radio/radio_git.bb | 2 +- recipes-demo/settings/settings_git.bb | 2 +- scripts/run-yocto-check-layer-all-layers.sh | 6 ------ 19 files changed, 18 insertions(+), 24 deletions(-) diff --git a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb index d3e076469..d3f6ddbdb 100644 --- a/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb +++ b/recipes-demo/agl-service-audiomixer/agl-service-audiomixer_git.bb @@ -11,7 +11,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-audiomixer.g file://agl-service-audiomixer.conf \ file://agl-service-audiomixer.token \ " -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "298bbf445a731b85cb8d5d19a3b595e8870d8701" PV = "2.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/recipes-demo/agl-service-hvac/agl-service-hvac_git.bb b/recipes-demo/agl-service-hvac/agl-service-hvac_git.bb index b88643376..784e6805c 100644 --- a/recipes-demo/agl-service-hvac/agl-service-hvac_git.bb +++ b/recipes-demo/agl-service-hvac/agl-service-hvac_git.bb @@ -11,7 +11,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-hvac;protoco file://agl-service-hvac.conf \ file://agl-service-hvac.token \ " -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "471656151c2b35b0f2f96983c09ffb51aec310eb" PV = "2.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/recipes-demo/camera-gstreamer/camera-gstreamer_git.bb b/recipes-demo/camera-gstreamer/camera-gstreamer_git.bb index e9fa575b5..9aba58bb2 100644 --- a/recipes-demo/camera-gstreamer/camera-gstreamer_git.bb +++ b/recipes-demo/camera-gstreamer/camera-gstreamer_git.bb @@ -14,7 +14,7 @@ DEPENDS = " \ PV = "1.0+git${SRCPV}" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/camera-gstreamer;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "34efd4841a603163762e267e373be06a4473c252" S = "${WORKDIR}/git" diff --git a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb index e50fb102a..bd5f7f54b 100644 --- a/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb +++ b/recipes-demo/cluster-dashboard/cluster-dashboard_git.bb @@ -22,7 +22,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-cluster-demo-dashboa file://cluster-dashboard.conf \ file://cluster-dashboard.token \ " -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "c65fa79b1aecebdd6b6a395506e5161f117f2576" S = "${WORKDIR}/git" diff --git a/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb b/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb index 4210754f8..406568eb9 100644 --- a/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb +++ b/recipes-demo/cluster-gauges-qtcompositor/cluster-gauges-qtcompositor_git.bb @@ -15,7 +15,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-cluster-demo-gauges; file://cluster-gauges-qtcompositor.service \ " -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "4bc6493ef950a6654067665578594b697527221f" S = "${WORKDIR}/git" diff --git a/recipes-demo/cluster-receiver/cluster-receiver_git.bb b/recipes-demo/cluster-receiver/cluster-receiver_git.bb index 3b1dd6a08..2bb71022a 100644 --- a/recipes-demo/cluster-receiver/cluster-receiver_git.bb +++ b/recipes-demo/cluster-receiver/cluster-receiver_git.bb @@ -17,7 +17,7 @@ PV = "1.0+git${SRCPV}" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-cluster-demo-receiver;protocol=https;branch=${AGL_BRANCH} \ file://cluster-receiver.service \ " -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "4af517a670a67ca6d9535784ecd5be0e95d659e0" S = "${WORKDIR}/git" diff --git a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb index d43ab4376..a871e9786 100644 --- a/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb +++ b/recipes-demo/cluster-receiver/qt-cluster-receiver_git.bb @@ -19,7 +19,7 @@ PV = "1.0+git${SRCPV}" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-qt-cluster-demo-receiver;protocol=https;branch=${AGL_BRANCH} \ file://qt-cluster-receiver.service \ " -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "867f8df04291c9b9e7d5087da22ed7782f98a1ea" S = "${WORKDIR}/git" diff --git a/recipes-demo/dashboard/dashboard_git.bb b/recipes-demo/dashboard/dashboard_git.bb index 5a56ff715..8ed5391ea 100644 --- a/recipes-demo/dashboard/dashboard_git.bb +++ b/recipes-demo/dashboard/dashboard_git.bb @@ -18,7 +18,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/dashboard;protocol=https file://dashboard.conf \ file://dashboard.token \ " -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "f694b1f1222a58bdb3d1990fda9184fe51754af7" S = "${WORKDIR}/git" diff --git a/recipes-demo/homescreen/homescreen_git.bb b/recipes-demo/homescreen/homescreen_git.bb index 29f0678f8..8f74defdf 100644 --- a/recipes-demo/homescreen/homescreen_git.bb +++ b/recipes-demo/homescreen/homescreen_git.bb @@ -25,7 +25,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/homescreen;protocol=http file://homescreen.conf \ file://homescreen.token \ " -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "e3b392b8a0767f35e6dbbdb1e9d126294aebdcb5" S = "${WORKDIR}/git" diff --git a/recipes-demo/hvac/hvac_git.bb b/recipes-demo/hvac/hvac_git.bb index 2f3307c91..53d070c46 100644 --- a/recipes-demo/hvac/hvac_git.bb +++ b/recipes-demo/hvac/hvac_git.bb @@ -20,7 +20,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/hvac;protocol=https;bran file://hvac.conf \ file://hvac.token \ " -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "2f96cf1047608fa5bf83addc52695b1b7d23b28c" S = "${WORKDIR}/git" diff --git a/recipes-demo/launcher/launcher_git.bb b/recipes-demo/launcher/launcher_git.bb index e67734151..431c96aef 100644 --- a/recipes-demo/launcher/launcher_git.bb +++ b/recipes-demo/launcher/launcher_git.bb @@ -25,7 +25,7 @@ SRC_URI = " \ git://gerrit.automotivelinux.org/gerrit/apps/launcher;protocol=https;branch=${AGL_BRANCH} \ file://launcher.service \ " -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "21a1fef41137a1dffc6ff0a602665999a7f6cc66" S = "${WORKDIR}/git" diff --git a/recipes-demo/mediaplayer/mediaplayer_git.bb b/recipes-demo/mediaplayer/mediaplayer_git.bb index b4fa58c85..fcab4a0d5 100644 --- a/recipes-demo/mediaplayer/mediaplayer_git.bb +++ b/recipes-demo/mediaplayer/mediaplayer_git.bb @@ -14,7 +14,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/mediaplayer;protocol=htt file://mediaplayer.conf \ file://mediaplayer.token \ " -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "5461945a951debb86430b4e8c94e5666e543ba22" S = "${WORKDIR}/git" diff --git a/recipes-demo/messaging/messaging_git.bb b/recipes-demo/messaging/messaging_git.bb index 47b3be8e6..65959b395 100644 --- a/recipes-demo/messaging/messaging_git.bb +++ b/recipes-demo/messaging/messaging_git.bb @@ -11,7 +11,7 @@ DEPENDS = "qtquickcontrols2 libqtappfw" PV = "1.0+git${SRCPV}" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/messaging;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "b895fde2c991117f910a62b54072dcad348b166e" S = "${WORKDIR}/git" diff --git a/recipes-demo/navigation/ondemandnavi_git.bb b/recipes-demo/navigation/ondemandnavi_git.bb index 2cc972a35..d342b5015 100644 --- a/recipes-demo/navigation/ondemandnavi_git.bb +++ b/recipes-demo/navigation/ondemandnavi_git.bb @@ -14,7 +14,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/ondemandnavi;protocol=ht file://navigation.conf \ file://navigation.token \ " -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "9ec20127855f3c48ed58589f9674100edbec3f92" S = "${WORKDIR}/git" diff --git a/recipes-demo/navigation/tbtnavi_git.bb b/recipes-demo/navigation/tbtnavi_git.bb index 66cafe6a9..d98644dad 100644 --- a/recipes-demo/navigation/tbtnavi_git.bb +++ b/recipes-demo/navigation/tbtnavi_git.bb @@ -27,7 +27,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/tbtnavi;protocol=https;b file://tbtnavi.conf \ file://tbtnavi.token \ " -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "81ded150718320da690908544f041addb2f56102" S = "${WORKDIR}/git" diff --git a/recipes-demo/phone/phone_git.bb b/recipes-demo/phone/phone_git.bb index 5e89af53a..6c4185999 100644 --- a/recipes-demo/phone/phone_git.bb +++ b/recipes-demo/phone/phone_git.bb @@ -11,7 +11,7 @@ DEPENDS = "qtquickcontrols2 libqtappfw gstreamer1.0" PV = "1.0+git${SRCPV}" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/phone;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "067f1e0b7b1454922e09efada608410cd3b955b0" S = "${WORKDIR}/git" diff --git a/recipes-demo/radio/radio_git.bb b/recipes-demo/radio/radio_git.bb index e4dd07c7a..1aa44d19d 100644 --- a/recipes-demo/radio/radio_git.bb +++ b/recipes-demo/radio/radio_git.bb @@ -15,7 +15,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/radio;protocol=https;bra file://presets-CES.conf \ file://presets-FOSDEM.conf \ " -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "06e706215977c1c314a9316e5b853ec6fb54e304" S = "${WORKDIR}/git" diff --git a/recipes-demo/settings/settings_git.bb b/recipes-demo/settings/settings_git.bb index 4dd151355..647283383 100644 --- a/recipes-demo/settings/settings_git.bb +++ b/recipes-demo/settings/settings_git.bb @@ -17,7 +17,7 @@ DEPENDS = " \ PV = "2.0+git${SRCPV}" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/settings;protocol=https;branch=${AGL_BRANCH}" -SRCREV = "${AGL_APP_REVISION}" +SRCREV = "03330b92227fabff891b6bdbce4bf7f3c27a3e61" S = "${WORKDIR}/git" diff --git a/scripts/run-yocto-check-layer-all-layers.sh b/scripts/run-yocto-check-layer-all-layers.sh index d5c1423d7..56ee15e4b 100755 --- a/scripts/run-yocto-check-layer-all-layers.sh +++ b/scripts/run-yocto-check-layer-all-layers.sh @@ -29,13 +29,7 @@ VIRTUAL-RUNTIME_init_manager = "systemd" # workaround: #ERROR: Nothing RPROVIDES 'qtwebengine-qmlplugins' (but /home/dl9pf/AGL/master-newlayout/external/meta-qt5/recipes-qt/qt5/qt5-creator_git.bb RDEPENDS on or otherwise requires it) BBMASK += "meta-qt5/recipes-qt/qt5/qt5-creator_git.bb" -#ERROR: Nothing RPROVIDES 'python' (but /home/dl9pf/AGL/master-newlayout/external/meta-security/recipes-mac/smack/smack-test_1.0.bb RDEPENDS on or otherwise requires it) -BBMASK += "meta-security/recipes-mac/smack/smack-test_1.0.bb" -# missing in upstream recipes ... aka FIXME upstream -BBCLASSEXTEND:pn-libzip = "native nativesdk" -BBCLASSEXTEND:pn-xmlsec1 = "native nativesdk" -AGL_APP_REVISION = "${AUTOREV}" EOF -- 2.16.6