From 39ed7563490002e59e4d69136ce87aea20fc1000 Mon Sep 17 00:00:00 2001 From: Naoto Yamaguchi Date: Mon, 8 Nov 2021 00:48:52 +0900 Subject: Fix recipe style error at mominavi recipe The bitbake recipe has style guide at https://www.openembedded.org/wiki/Styleguide Existing mominavi recipe does not fit this style guide. This patch fix this issue. Bug-AGL: SPEC-4095 Signed-off-by: Naoto Yamaguchi Change-Id: I150ab671248be800c1d955c5e47a1792510ea4c7 --- meta-agl-lxc/recipes-demo/mominavi/mominavi_git.bb | 51 +++++++++++++--------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/meta-agl-lxc/recipes-demo/mominavi/mominavi_git.bb b/meta-agl-lxc/recipes-demo/mominavi/mominavi_git.bb index 862b3861..5bd0d791 100644 --- a/meta-agl-lxc/recipes-demo/mominavi/mominavi_git.bb +++ b/meta-agl-lxc/recipes-demo/mominavi/mominavi_git.bb @@ -4,12 +4,16 @@ DESCRIPTION = "The mominavi is a navigation example based on mapbox. It's based LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" -PV = "0.2.0" - -inherit qmake5 systemd +DEPENDS = " \ + qtbase \ + qtquickcontrols2 \ + qtlocation \ + qtgraphicaleffects \ + qtsvg \ + qtwebsockets \ + " -DEPENDS = "qtbase qtquickcontrols2 qtlocation qtgraphicaleffects qtsvg qtwebsockets " -RDEPENDS_${PN} = "qtsvg qtwebsockets qtlocation" +PV = "0.2.0" SRC_URI = "git://github.com/AGLExport/mominavi.git;protocol=https \ file://mominavi.service \ @@ -19,28 +23,35 @@ SRCREV = "b427b70ecbf474bdd3e0802b7bcf779e77e8d2ef" S = "${WORKDIR}/git" -MOMIMAP_MAPBOX_ACCESS_TOKEN ??= "YOU_NEED_TO_SET_IT_IN_LOCAL_CONF" +inherit qmake5 systemd +MOMIMAP_MAPBOX_ACCESS_TOKEN ??= "YOU_NEED_TO_SET_IT_IN_LOCAL_CONF" QT_INSTALL_PREFIX = "/usr" -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "mominavi.service" - -do_configure_prepend() { +do_configure:prepend() { if [ "${MOMIMAP_MAPBOX_ACCESS_TOKEN}" = "YOU_NEED_TO_SET_IT_IN_LOCAL_CONF" ]; then bbwarn "WARNING: You should set MapBox development key to MOMIMAP_MAPBOX_ACCESS_TOKEN variable in local.conf." fi } -do_install_append() { - install -d ${D}/lib/systemd/system - install -m 0644 ${WORKDIR}/mominavi.service ${D}/lib/systemd/system - - install -m 0755 -d ${D}${sysconfdir}/default/ - install -m 0755 ${WORKDIR}/mominavi ${D}${sysconfdir}/default/ - - echo 'MOMIMAP_MAPBOX_ACCESS_TOKEN=${MOMIMAP_MAPBOX_ACCESS_TOKEN}' >> ${D}${sysconfdir}/default/mominavi -} +do_install:append() { + install -d ${D}/lib/systemd/system + install -m 0644 ${WORKDIR}/mominavi.service ${D}/lib/systemd/system -FILES_${PN} += " ${systemd_unitdir} ${sysconfdir}/*/* " + install -m 0755 -d ${D}${sysconfdir}/default/ + install -m 0755 ${WORKDIR}/mominavi ${D}${sysconfdir}/default/ + echo 'MOMIMAP_MAPBOX_ACCESS_TOKEN=${MOMIMAP_MAPBOX_ACCESS_TOKEN}' >> ${D}${sysconfdir}/default/mominavi +} + +FILES:${PN} += " \ + ${systemd_unitdir} \ + ${sysconfdir}/*/* \ + " +SYSTEMD_PACKAGES = "${PN}" +SYSTEMD_SERVICE:${PN} = "mominavi.service" +RDEPENDS:${PN} = " \ + qtsvg \ + qtwebsockets \ + qtlocation \ + " -- cgit 1.2.3-korg