Denys: -----Original Message----- From: Dmytriyenko, Denys Sent: Friday, March 02, 2018 10:46 PM To: Ruei, Eric Cc: meta-arago@arago-project.org Subject: Re: [meta-arago] [morty/rocko/master][PATCH v3 1/4] qt-tstat: pickup the latest version for both Qt4/Qt5 support
On Wed, Feb 28, 2018 at 01:40:57PM -0500, Eric Ruei wrote: > - update the git URL and SRCREV > - select matrix desktop file based on QT vesion > > Signed-off-by: Eric Ruei <e-ru...@ti.com> > --- > .../recipes-apps/thermostat-demo/qt-tstat_2.0.bb | 19 > +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb > b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb > index 494d582..43e35ab 100644 > --- a/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb > +++ b/meta-arago-extras/recipes-apps/thermostat-demo/qt-tstat_2.0.bb > @@ -12,31 +12,30 @@ require recipes-core/matrix/matrix-gui-paths.inc > > inherit qt-provider > > -PR = "r9" > +PR = "r10" > > DEPENDS += "${QT_DEPENDS_SVG} ${QT_DEPENDS_SCRIPT}" > > BRANCH ?= "master" > -SRCREV = "2512773c2d9da989e6a42c1e90b2b34496713072" > +SRCREV = "3429dfc4333f11b9022e3aa6fd2850c5093777f9" ^^^^^^^^^^^^^^^^^^^^^^^^^^^ Where is this commit ID? It is a typo and it should be 665bff9a7bc0dbf82f9d6a58ff2778c03fe04fd1. I shall verify and submit patch-v4 shortly. Eric > -SRC_URI = " \ > - git://gitorious.org/thermostat-demo/thermostat-demo.git;protocol=git \ > -" > - > -SRC_URI += "${@base_conditional('QT_PROVIDER', 'qt5', > 'file://0002-Replace-QtGui-with-QtWidgets-per-Qt5-migration-guide.patch \ > - > file://0003-Replace-fromAscii-toAscii-with-fromLatin1-toLatin1-p.patch', '', > d)}" > +SRC_URI = > "git://git.ti.com/apps/thermostat-demo.git;protocol=git;branch=${BRANCH}" > > S = "${WORKDIR}/git/" > > +DESKTOP_FILE = "${@base_conditional('QT_PROVIDER', 'qt5', > 'thermostat_demo_qt5.desktop', 'thermostat_demo.desktop', d)}" > + > + > do_install() { > install -d ${D}/usr/bin > install -m 0755 ${B}/ThermostatDemo ${D}/usr/bin/ThermostatDemo > install -d ${D}${MATRIX_APP_DIR}/qt_tstat > - cp -rf ${S}/matrix-files/* ${D}${MATRIX_APP_DIR}/qt_tstat > + install ${S}/matrix-files/desc_thermostat_demo.html > ${D}${MATRIX_APP_DIR}/qt_tstat > + install ${S}/matrix-files/${DESKTOP_FILE} > ${D}${MATRIX_APP_DIR}/qt_tstat/thermostat_demo.desktop > } > > PACKAGES += "matrix-gui-thermostat-demo" > > -RDEPENDS_matrix-gui-thermostat-demo += "matrix-gui-apps-images > matrix-gui-submenus-qt4" > +RDEPENDS_matrix-gui-thermostat-demo += "matrix-gui-apps-images > ${@base_conditional('QT_PROVIDER', 'qt5', 'matrix-gui-submenus-qt5', > 'matrix-gui-submenus-qt4', d)}" > > FILES_matrix-gui-thermostat-demo += "${MATRIX_APP_DIR}/*" > -- > 1.9.1 > > _______________________________________________ > meta-arago mailing list > meta-arago@arago-project.org > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago _______________________________________________ meta-arago mailing list meta-arago@arago-project.org http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago