From 83e08d62a81dcdcfe9e7bb7bea1bd8469478cd69 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 25 Feb 2021 15:55:03 -0500 Subject: Fix S definitions in various recipes Bitbake in poky master now warns if the path in the S variable definition has a trailing '/', remove all occurrences to reduce "next" branch maintenance. Bug-AGL: SPEC-3819 Signed-off-by: Scott Murray Change-Id: I226095245c208e579b6b176d333918d5e1c70844 --- recipes-apis/agl-service-cloudproxy/agl-service-cloudproxy_git.bb | 2 +- recipes-demo/homescreen-demo-ci/homescreen-demo-ci_git.bb | 2 +- recipes-demo/homescreen/homescreen_git.bb | 2 +- recipes-demo/html5-background/html5-background_git.bb | 2 +- recipes-demo/html5-dashboard/html5-dashboard_git.bb | 2 +- recipes-demo/html5-homescreen/html5-homescreen_git.bb | 2 +- recipes-demo/html5-hvac/html5-hvac_git.bb | 2 +- recipes-demo/html5-launcher/html5-launcher_git.bb | 2 +- recipes-demo/html5-mediaplayer/html5-mediaplayer_git.bb | 2 +- recipes-demo/html5-mixer/html5-mixer_git.bb | 2 +- recipes-demo/html5-settings/html5-settings_git.bb | 2 +- recipes-demo/inputeventmanager/inputeventmanager_git.bb | 2 +- recipes-demo/launcher/launcher_git.bb | 2 +- .../qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb | 2 +- recipes-demo/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb | 2 +- recipes-qt/qt-qrcode/qt-qrcode_git.bb | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/recipes-apis/agl-service-cloudproxy/agl-service-cloudproxy_git.bb b/recipes-apis/agl-service-cloudproxy/agl-service-cloudproxy_git.bb index 99773a42c..03e6a0eb5 100644 --- a/recipes-apis/agl-service-cloudproxy/agl-service-cloudproxy_git.bb +++ b/recipes-apis/agl-service-cloudproxy/agl-service-cloudproxy_git.bb @@ -9,7 +9,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/agl-service-cloudproxy;p SRCREV = "${AGL_APP_REVISION}" PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" DEPENDS = "azure-iot-sdk-c aws-iot-device-sdk-embedded-c glib-2.0 nlohmann-json" diff --git a/recipes-demo/homescreen-demo-ci/homescreen-demo-ci_git.bb b/recipes-demo/homescreen-demo-ci/homescreen-demo-ci_git.bb index c3814f114..8155b6593 100644 --- a/recipes-demo/homescreen-demo-ci/homescreen-demo-ci_git.bb +++ b/recipes-demo/homescreen-demo-ci/homescreen-demo-ci_git.bb @@ -26,7 +26,7 @@ SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/homescreen-demo-ci;proto SRCREV = "${AGL_APP_REVISION}" PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" diff --git a/recipes-demo/homescreen/homescreen_git.bb b/recipes-demo/homescreen/homescreen_git.bb index 2fb000faf..1ec938b70 100644 --- a/recipes-demo/homescreen/homescreen_git.bb +++ b/recipes-demo/homescreen/homescreen_git.bb @@ -23,7 +23,7 @@ PV = "1.0+git${SRCPV}" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/homescreen;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" inherit qmake5 systemd pkgconfig aglwgt diff --git a/recipes-demo/html5-background/html5-background_git.bb b/recipes-demo/html5-background/html5-background_git.bb index c0ac220f5..4be560709 100644 --- a/recipes-demo/html5-background/html5-background_git.bb +++ b/recipes-demo/html5-background/html5-background_git.bb @@ -3,7 +3,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" SRC_URI = "git://github.com/AGL-web-applications/background.git;protocol=https;branch=master" SRCREV = "3b8dae349d428c0230b9885f86d421d43cda5638" diff --git a/recipes-demo/html5-dashboard/html5-dashboard_git.bb b/recipes-demo/html5-dashboard/html5-dashboard_git.bb index ac874755e..7f375670b 100644 --- a/recipes-demo/html5-dashboard/html5-dashboard_git.bb +++ b/recipes-demo/html5-dashboard/html5-dashboard_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-dashboard;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" diff --git a/recipes-demo/html5-homescreen/html5-homescreen_git.bb b/recipes-demo/html5-homescreen/html5-homescreen_git.bb index 37ca70737..f927cb70b 100644 --- a/recipes-demo/html5-homescreen/html5-homescreen_git.bb +++ b/recipes-demo/html5-homescreen/html5-homescreen_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-homescreen;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" diff --git a/recipes-demo/html5-hvac/html5-hvac_git.bb b/recipes-demo/html5-hvac/html5-hvac_git.bb index 7fc89aed9..91654b42b 100644 --- a/recipes-demo/html5-hvac/html5-hvac_git.bb +++ b/recipes-demo/html5-hvac/html5-hvac_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-hvac;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" diff --git a/recipes-demo/html5-launcher/html5-launcher_git.bb b/recipes-demo/html5-launcher/html5-launcher_git.bb index 47760f676..ab99cf5f0 100644 --- a/recipes-demo/html5-launcher/html5-launcher_git.bb +++ b/recipes-demo/html5-launcher/html5-launcher_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-launcher;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" diff --git a/recipes-demo/html5-mediaplayer/html5-mediaplayer_git.bb b/recipes-demo/html5-mediaplayer/html5-mediaplayer_git.bb index a87b9bcf4..ddb2ee29f 100644 --- a/recipes-demo/html5-mediaplayer/html5-mediaplayer_git.bb +++ b/recipes-demo/html5-mediaplayer/html5-mediaplayer_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-mediaplayer;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" diff --git a/recipes-demo/html5-mixer/html5-mixer_git.bb b/recipes-demo/html5-mixer/html5-mixer_git.bb index 97b1195c8..e643c59c7 100644 --- a/recipes-demo/html5-mixer/html5-mixer_git.bb +++ b/recipes-demo/html5-mixer/html5-mixer_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-mixer;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" diff --git a/recipes-demo/html5-settings/html5-settings_git.bb b/recipes-demo/html5-settings/html5-settings_git.bb index a167b1428..010c69105 100644 --- a/recipes-demo/html5-settings/html5-settings_git.bb +++ b/recipes-demo/html5-settings/html5-settings_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" PV = "1.0+git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/html5-settings;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" diff --git a/recipes-demo/inputeventmanager/inputeventmanager_git.bb b/recipes-demo/inputeventmanager/inputeventmanager_git.bb index 16ee007f7..8a0c72c14 100644 --- a/recipes-demo/inputeventmanager/inputeventmanager_git.bb +++ b/recipes-demo/inputeventmanager/inputeventmanager_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "InputEventManager" HOMEPAGE = "http://docs.automotivelinux.org" LICENSE = "Apache-2.0" SECTION = "apps" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" inherit qmake5 systemd DEPENDS = " qtbase " diff --git a/recipes-demo/launcher/launcher_git.bb b/recipes-demo/launcher/launcher_git.bb index 363707086..115ebcc42 100644 --- a/recipes-demo/launcher/launcher_git.bb +++ b/recipes-demo/launcher/launcher_git.bb @@ -22,7 +22,7 @@ PV = "1.0+git${SRCPV}" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/apps/launcher;protocol=https;branch=${AGL_BRANCH}" SRCREV = "${AGL_APP_REVISION}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" inherit qmake5 systemd pkgconfig aglwgt diff --git a/recipes-demo/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb b/recipes-demo/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb index 605c4cebf..be2eace53 100644 --- a/recipes-demo/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb +++ b/recipes-demo/qtquickcontrols2-agl-style/qtquickcontrols2-agl-style_git.bb @@ -10,7 +10,7 @@ PV = "1.0+git${SRCPV}" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/qtquickcontrols2-agl-style;protocol=https;branch=${AGL_BRANCH}" SRCREV = "c02692a3c20d9aed1192137a67d5be882c60e71f" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" inherit qmake5 diff --git a/recipes-demo/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb b/recipes-demo/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb index faab2214e..a81e1a9c1 100644 --- a/recipes-demo/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb +++ b/recipes-demo/qtquickcontrols2-agl/qtquickcontrols2-agl_git.bb @@ -10,7 +10,7 @@ PV = "1.0+git${SRCPV}" SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/qtquickcontrols2-agl;protocol=https;branch=${AGL_BRANCH}" SRCREV = "22b538aae1f69de5273f1e42a854cfab23a32b60" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" inherit qmake5 diff --git a/recipes-qt/qt-qrcode/qt-qrcode_git.bb b/recipes-qt/qt-qrcode/qt-qrcode_git.bb index 0a7ae7308..fcc71390d 100644 --- a/recipes-qt/qt-qrcode/qt-qrcode_git.bb +++ b/recipes-qt/qt-qrcode/qt-qrcode_git.bb @@ -14,6 +14,6 @@ SRC_URI = "git://github.com/danielsanfr/qt-qrcode.git;protocol=https \ SRCREV = "2d57d9c6e2341689d10f9360a16a08831a4a820b" PV = "git${SRCPV}" -S = "${WORKDIR}/git/" +S = "${WORKDIR}/git" inherit qmake5 -- cgit 1.2.3-korg