Patchwork [meta-oe] libconnman-qt: update to 1.0.46, add recipe for qte

login
register
mail settings
Submitter Andreas Oberritter
Date Jan. 20, 2014, 3:08 p.m.
Message ID <1390230519-21756-1-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/65267/
State Accepted, archived
Headers show

Comments

Andreas Oberritter - Jan. 20, 2014, 3:08 p.m.
* Use _git version suffix, because it really is a Git recipe.
* Create an inc file to be shared between qt4x11 and qt4e.
* Use CONFIG+=notests, because CONFIG+=notest has no effect now.
* Reorder some variables according to style guide.
* Remove unneeded PROVIDES for ${PN}-plugin, which is already listed
  in PACKAGES.
* Hardcode branch to master, because no other branch exists upstream.
* Simplify do_install.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 .../{libconnman-qt_1.0.7.bb => libconnman-qt.inc}  | 61 +++++++++-------------
 .../recipes-qt/libconnman-qt/libconnman-qt_git.bb  |  3 ++
 .../recipes-qt/libconnman-qt/libconnman-qte_git.bb |  3 ++
 3 files changed, 30 insertions(+), 37 deletions(-)
 rename meta-oe/recipes-qt/libconnman-qt/{libconnman-qt_1.0.7.bb => libconnman-qt.inc} (65%)
 create mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qt_git.bb
 create mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb
Otavio Salvador - Jan. 22, 2014, 2:23 p.m.
On Mon, Jan 20, 2014 at 1:08 PM, Andreas Oberritter
<obi@opendreambox.org> wrote:
> * Use _git version suffix, because it really is a Git recipe.
> * Create an inc file to be shared between qt4x11 and qt4e.
> * Use CONFIG+=notests, because CONFIG+=notest has no effect now.
> * Reorder some variables according to style guide.
> * Remove unneeded PROVIDES for ${PN}-plugin, which is already listed
>   in PACKAGES.
> * Hardcode branch to master, because no other branch exists upstream.
> * Simplify do_install.
>
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>

Reviewed-by: Otavio Salvador <otavio@ossystems.com.br>

Felipe, as I know you use this, may you take a second look here?
eu@felipetonello.com - Jan. 22, 2014, 5:40 p.m.
Hi Andreas,

On 01/20/2014 07:08 AM, Andreas Oberritter wrote:
> * Use _git version suffix, because it really is a Git recipe.
> * Create an inc file to be shared between qt4x11 and qt4e.
> * Use CONFIG+=notests, because CONFIG+=notest has no effect now.
> * Reorder some variables according to style guide.
> * Remove unneeded PROVIDES for ${PN}-plugin, which is already listed
>    in PACKAGES.
> * Hardcode branch to master, because no other branch exists upstream.
> * Simplify do_install.
>
> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> ---
>   .../{libconnman-qt_1.0.7.bb => libconnman-qt.inc}  | 61 +++++++++-------------
>   .../recipes-qt/libconnman-qt/libconnman-qt_git.bb  |  3 ++
>   .../recipes-qt/libconnman-qt/libconnman-qte_git.bb |  3 ++
>   3 files changed, 30 insertions(+), 37 deletions(-)
>   rename meta-oe/recipes-qt/libconnman-qt/{libconnman-qt_1.0.7.bb => libconnman-qt.inc} (65%)
>   create mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qt_git.bb
>   create mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb
>
> diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
> similarity index 65%
> rename from meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb
> rename to meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
> index 2288c4f..e4f68db 100644
> --- a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb
> +++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
> @@ -1,66 +1,53 @@
>   DESCRIPTION = "Qt Library for ConnMan"
>   HOMEPAGE = "https://github.com/nemomobile/libconnman-qt"
> +SECTION = "qt/lib"
>   LICENSE = "Apache-2.0"
>   LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
> +SRCREV = "ddbeaf72b4d3c49285b0513b28948edacfc40b51"
> +PV = "1.0.46+git${SRCPV}"
>
> -SECTION = "qt/lib"
> -
> -
> -inherit qt4x11 pkgconfig
> -
> -RDEPENDS_${PN} = "connman"
> -RDEPENDS_${PN}-plugin = "${PN}"
> -
> -PROVIDES += "${PN}-plugin"
> -
> -PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg"
> -RRECOMMENDS_${PN} = "${PN}-plugin"
> -
> -BRANCH = "master"
> -SRCREV = "6a5e4f981112a90a8c19d82bd671da389d2af993"
> -
> -SRC_URI = " \
> -    git://github.com/nemomobile/${PN}.git;branch=${BRANCH} \
> -"
> +SRC_URI = "git://github.com/nemomobile/libconnman-qt.git;branch=master"
>
>   S = "${WORKDIR}/git"
>
> -QT_IMPORTS_DIR = "${libdir}/qt4/imports"
> -# the plugin target needs to be the same as 'target.path' and 'qmldir.path' in ${S}/plugin/plugin.pro
> -PLUGINS_TARGET = "${QT_IMPORTS_DIR}/MeeGo/Connman"
> +inherit pkgconfig
>
> -EXTRA_QMAKEVARS_PRE = " \
> -    CONFIG+=notest \
> -"
> +EXTRA_QMAKEVARS_PRE = "CONFIG+=notests"
>
>   do_configure_prepend() {
>       # Hack *.pro variables
>       find ${S}/plugin/*.pro -exec sed -i -e 's,$$\[QT_INSTALL_IMPORTS\],${QT_IMPORTS_DIR},g' '{}' ';'
>   }
> -
>   do_install() {
> -    export INSTALL_ROOT=${D}
> -    oe_runmake install
> +    oe_runmake install INSTALL_ROOT=${D}

Are you sure this works with dash? Because the reason why I did the 
previous was to work in dash as well.

>   }
>
> +PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg"
> +
> +RDEPENDS_${PN} = "connman"
> +RDEPENDS_${PN}-plugin = "${PN}"
> +
> +RRECOMMENDS_${PN} = "${PN}-plugin"
> +
>   FILES_${PN} = " \
> -    ${libdir}/libconnman-qt4${SOLIBS} \
> +    ${libdir}/libconnman-qt*${SOLIBS} \
>   "
> -
>   FILES_${PN}-dev = " \
> -    ${includedir}/connman-qt/* \
> -    ${libdir}/libconnman-qt4${SOLIBSDEV} \
> -    ${libdir}/libconnman-qt4.prl \
> -    ${libdir}/pkgconfig/connman-qt4.pc \
> -    ${libdir}/connman-qt4.pc \
> +    ${includedir}/connman-qt*/* \
> +    ${libdir}/libconnman-qt*${SOLIBSDEV} \
> +    ${libdir}/libconnman-qt*.prl \
> +    ${libdir}/pkgconfig/connman-qt*.pc \
> +    ${libdir}/connman-qt*.pc \
>   "
> -
>   FILES_${PN}-plugin = " \
>       ${PLUGINS_TARGET}/qmldir \
>       ${PLUGINS_TARGET}/lib*.so \
>   "
> -
>   FILES_${PN}-plugin-dbg = " \
>       ${PLUGINS_TARGET}/.debug \
>       ${PLUGINS_TARGET}/.debug/* \
>   "
> +
> +QT_IMPORTS_DIR = "${libdir}/qt4/imports"

Doesn't Qt4 Embedded uses ${libdir}/qte/imports?

Felipe
Andreas Oberritter - Jan. 22, 2014, 6:57 p.m.
Hello Felipe,

On 22.01.2014 18:40, Felipe Ferreri Tonello wrote:
> Hi Andreas,
> 
> On 01/20/2014 07:08 AM, Andreas Oberritter wrote:
>> * Use _git version suffix, because it really is a Git recipe.
>> * Create an inc file to be shared between qt4x11 and qt4e.
>> * Use CONFIG+=notests, because CONFIG+=notest has no effect now.
>> * Reorder some variables according to style guide.
>> * Remove unneeded PROVIDES for ${PN}-plugin, which is already listed
>>    in PACKAGES.
>> * Hardcode branch to master, because no other branch exists upstream.
>> * Simplify do_install.
>>
>> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
>> ---
>>   .../{libconnman-qt_1.0.7.bb => libconnman-qt.inc}  | 61
>> +++++++++-------------
>>   .../recipes-qt/libconnman-qt/libconnman-qt_git.bb  |  3 ++
>>   .../recipes-qt/libconnman-qt/libconnman-qte_git.bb |  3 ++
>>   3 files changed, 30 insertions(+), 37 deletions(-)
>>   rename meta-oe/recipes-qt/libconnman-qt/{libconnman-qt_1.0.7.bb =>
>> libconnman-qt.inc} (65%)
>>   create mode 100644
>> meta-oe/recipes-qt/libconnman-qt/libconnman-qt_git.bb
>>   create mode 100644
>> meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb
>>
>> diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb
>> b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
>> similarity index 65%
>> rename from meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb
>> rename to meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
>> index 2288c4f..e4f68db 100644
>> --- a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb
>> +++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
>> @@ -1,66 +1,53 @@
>>   DESCRIPTION = "Qt Library for ConnMan"
>>   HOMEPAGE = "https://github.com/nemomobile/libconnman-qt"
>> +SECTION = "qt/lib"
>>   LICENSE = "Apache-2.0"
>>   LIC_FILES_CHKSUM =
>> "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
>>
>> +SRCREV = "ddbeaf72b4d3c49285b0513b28948edacfc40b51"
>> +PV = "1.0.46+git${SRCPV}"
>>
>> -SECTION = "qt/lib"
>> -
>> -
>> -inherit qt4x11 pkgconfig
>> -
>> -RDEPENDS_${PN} = "connman"
>> -RDEPENDS_${PN}-plugin = "${PN}"
>> -
>> -PROVIDES += "${PN}-plugin"
>> -
>> -PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg"
>> -RRECOMMENDS_${PN} = "${PN}-plugin"
>> -
>> -BRANCH = "master"
>> -SRCREV = "6a5e4f981112a90a8c19d82bd671da389d2af993"
>> -
>> -SRC_URI = " \
>> -    git://github.com/nemomobile/${PN}.git;branch=${BRANCH} \
>> -"
>> +SRC_URI = "git://github.com/nemomobile/libconnman-qt.git;branch=master"
>>
>>   S = "${WORKDIR}/git"
>>
>> -QT_IMPORTS_DIR = "${libdir}/qt4/imports"
>> -# the plugin target needs to be the same as 'target.path' and
>> 'qmldir.path' in ${S}/plugin/plugin.pro
>> -PLUGINS_TARGET = "${QT_IMPORTS_DIR}/MeeGo/Connman"
>> +inherit pkgconfig
>>
>> -EXTRA_QMAKEVARS_PRE = " \
>> -    CONFIG+=notest \
>> -"
>> +EXTRA_QMAKEVARS_PRE = "CONFIG+=notests"
>>
>>   do_configure_prepend() {
>>       # Hack *.pro variables
>>       find ${S}/plugin/*.pro -exec sed -i -e
>> 's,$$\[QT_INSTALL_IMPORTS\],${QT_IMPORTS_DIR},g' '{}' ';'
>>   }
>> -
>>   do_install() {
>> -    export INSTALL_ROOT=${D}
>> -    oe_runmake install
>> +    oe_runmake install INSTALL_ROOT=${D}
> 
> Are you sure this works with dash? Because the reason why I did the
> previous was to work in dash as well.

It's shell-agnostic, because the variable gets interpreted by make.

>>   }
>>
>> +PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg"
>> +
>> +RDEPENDS_${PN} = "connman"
>> +RDEPENDS_${PN}-plugin = "${PN}"
>> +
>> +RRECOMMENDS_${PN} = "${PN}-plugin"
>> +
>>   FILES_${PN} = " \
>> -    ${libdir}/libconnman-qt4${SOLIBS} \
>> +    ${libdir}/libconnman-qt*${SOLIBS} \
>>   "
>> -
>>   FILES_${PN}-dev = " \
>> -    ${includedir}/connman-qt/* \
>> -    ${libdir}/libconnman-qt4${SOLIBSDEV} \
>> -    ${libdir}/libconnman-qt4.prl \
>> -    ${libdir}/pkgconfig/connman-qt4.pc \
>> -    ${libdir}/connman-qt4.pc \
>> +    ${includedir}/connman-qt*/* \
>> +    ${libdir}/libconnman-qt*${SOLIBSDEV} \
>> +    ${libdir}/libconnman-qt*.prl \
>> +    ${libdir}/pkgconfig/connman-qt*.pc \
>> +    ${libdir}/connman-qt*.pc \
>>   "
>> -
>>   FILES_${PN}-plugin = " \
>>       ${PLUGINS_TARGET}/qmldir \
>>       ${PLUGINS_TARGET}/lib*.so \
>>   "
>> -
>>   FILES_${PN}-plugin-dbg = " \
>>       ${PLUGINS_TARGET}/.debug \
>>       ${PLUGINS_TARGET}/.debug/* \
>>   "
>> +
>> +QT_IMPORTS_DIR = "${libdir}/qt4/imports"
> 
> Doesn't Qt4 Embedded uses ${libdir}/qte/imports?

You're probably right (qtopia). I'll verify and post v2.

I tested this recipe with Qt4/X11 and Qt5 (not submitted yet, overrides
QT_IMPORTS_DIR), but Qt4/Embedded apparently went by the board.

Regards,
Andreas
Martin Jansa - Jan. 22, 2014, 7:09 p.m.
On Wed, Jan 22, 2014 at 07:57:05PM +0100, Andreas Oberritter wrote:
> Hello Felipe,
> 
> On 22.01.2014 18:40, Felipe Ferreri Tonello wrote:
> > Hi Andreas,
> > 
> > On 01/20/2014 07:08 AM, Andreas Oberritter wrote:
> >> * Use _git version suffix, because it really is a Git recipe.
> >> * Create an inc file to be shared between qt4x11 and qt4e.
> >> * Use CONFIG+=notests, because CONFIG+=notest has no effect now.
> >> * Reorder some variables according to style guide.
> >> * Remove unneeded PROVIDES for ${PN}-plugin, which is already listed
> >>    in PACKAGES.
> >> * Hardcode branch to master, because no other branch exists upstream.
> >> * Simplify do_install.
> >>
> >> Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
> >> ---
> >>   .../{libconnman-qt_1.0.7.bb => libconnman-qt.inc}  | 61
> >> +++++++++-------------
> >>   .../recipes-qt/libconnman-qt/libconnman-qt_git.bb  |  3 ++
> >>   .../recipes-qt/libconnman-qt/libconnman-qte_git.bb |  3 ++
> >>   3 files changed, 30 insertions(+), 37 deletions(-)
> >>   rename meta-oe/recipes-qt/libconnman-qt/{libconnman-qt_1.0.7.bb =>
> >> libconnman-qt.inc} (65%)
> >>   create mode 100644
> >> meta-oe/recipes-qt/libconnman-qt/libconnman-qt_git.bb
> >>   create mode 100644
> >> meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb
> >>
> >> diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb
> >> b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
> >> similarity index 65%
> >> rename from meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb
> >> rename to meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
> >> index 2288c4f..e4f68db 100644
> >> --- a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb
> >> +++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
> >> @@ -1,66 +1,53 @@
> >>   DESCRIPTION = "Qt Library for ConnMan"
> >>   HOMEPAGE = "https://github.com/nemomobile/libconnman-qt"
> >> +SECTION = "qt/lib"
> >>   LICENSE = "Apache-2.0"
> >>   LIC_FILES_CHKSUM =
> >> "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
> >>
> >> +SRCREV = "ddbeaf72b4d3c49285b0513b28948edacfc40b51"
> >> +PV = "1.0.46+git${SRCPV}"
> >>
> >> -SECTION = "qt/lib"
> >> -
> >> -
> >> -inherit qt4x11 pkgconfig
> >> -
> >> -RDEPENDS_${PN} = "connman"
> >> -RDEPENDS_${PN}-plugin = "${PN}"
> >> -
> >> -PROVIDES += "${PN}-plugin"
> >> -
> >> -PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg"
> >> -RRECOMMENDS_${PN} = "${PN}-plugin"
> >> -
> >> -BRANCH = "master"
> >> -SRCREV = "6a5e4f981112a90a8c19d82bd671da389d2af993"
> >> -
> >> -SRC_URI = " \
> >> -    git://github.com/nemomobile/${PN}.git;branch=${BRANCH} \
> >> -"
> >> +SRC_URI = "git://github.com/nemomobile/libconnman-qt.git;branch=master"
> >>
> >>   S = "${WORKDIR}/git"
> >>
> >> -QT_IMPORTS_DIR = "${libdir}/qt4/imports"
> >> -# the plugin target needs to be the same as 'target.path' and
> >> 'qmldir.path' in ${S}/plugin/plugin.pro
> >> -PLUGINS_TARGET = "${QT_IMPORTS_DIR}/MeeGo/Connman"
> >> +inherit pkgconfig
> >>
> >> -EXTRA_QMAKEVARS_PRE = " \
> >> -    CONFIG+=notest \
> >> -"
> >> +EXTRA_QMAKEVARS_PRE = "CONFIG+=notests"
> >>
> >>   do_configure_prepend() {
> >>       # Hack *.pro variables
> >>       find ${S}/plugin/*.pro -exec sed -i -e
> >> 's,$$\[QT_INSTALL_IMPORTS\],${QT_IMPORTS_DIR},g' '{}' ';'
> >>   }
> >> -
> >>   do_install() {
> >> -    export INSTALL_ROOT=${D}
> >> -    oe_runmake install
> >> +    oe_runmake install INSTALL_ROOT=${D}
> > 
> > Are you sure this works with dash? Because the reason why I did the
> > previous was to work in dash as well.
> 
> It's shell-agnostic, because the variable gets interpreted by make.

It should be, but I remember it too, it was failing in jenkins job on
server with dash, I'll confirm when it fails.

> >>   }
> >>
> >> +PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg"
> >> +
> >> +RDEPENDS_${PN} = "connman"
> >> +RDEPENDS_${PN}-plugin = "${PN}"
> >> +
> >> +RRECOMMENDS_${PN} = "${PN}-plugin"
> >> +
> >>   FILES_${PN} = " \
> >> -    ${libdir}/libconnman-qt4${SOLIBS} \
> >> +    ${libdir}/libconnman-qt*${SOLIBS} \
> >>   "
> >> -
> >>   FILES_${PN}-dev = " \
> >> -    ${includedir}/connman-qt/* \
> >> -    ${libdir}/libconnman-qt4${SOLIBSDEV} \
> >> -    ${libdir}/libconnman-qt4.prl \
> >> -    ${libdir}/pkgconfig/connman-qt4.pc \
> >> -    ${libdir}/connman-qt4.pc \
> >> +    ${includedir}/connman-qt*/* \
> >> +    ${libdir}/libconnman-qt*${SOLIBSDEV} \
> >> +    ${libdir}/libconnman-qt*.prl \
> >> +    ${libdir}/pkgconfig/connman-qt*.pc \
> >> +    ${libdir}/connman-qt*.pc \
> >>   "
> >> -
> >>   FILES_${PN}-plugin = " \
> >>       ${PLUGINS_TARGET}/qmldir \
> >>       ${PLUGINS_TARGET}/lib*.so \
> >>   "
> >> -
> >>   FILES_${PN}-plugin-dbg = " \
> >>       ${PLUGINS_TARGET}/.debug \
> >>       ${PLUGINS_TARGET}/.debug/* \
> >>   "
> >> +
> >> +QT_IMPORTS_DIR = "${libdir}/qt4/imports"
> > 
> > Doesn't Qt4 Embedded uses ${libdir}/qte/imports?
> 
> You're probably right (qtopia). I'll verify and post v2.
> 
> I tested this recipe with Qt4/X11 and Qt5 (not submitted yet, overrides
> QT_IMPORTS_DIR), but Qt4/Embedded apparently went by the board.
> 
> Regards,
> Andreas
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
similarity index 65%
rename from meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb
rename to meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
index 2288c4f..e4f68db 100644
--- a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb
+++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc
@@ -1,66 +1,53 @@ 
 DESCRIPTION = "Qt Library for ConnMan"
 HOMEPAGE = "https://github.com/nemomobile/libconnman-qt"
+SECTION = "qt/lib"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
+SRCREV = "ddbeaf72b4d3c49285b0513b28948edacfc40b51"
+PV = "1.0.46+git${SRCPV}"
 
-SECTION = "qt/lib"
-
-
-inherit qt4x11 pkgconfig
-
-RDEPENDS_${PN} = "connman"
-RDEPENDS_${PN}-plugin = "${PN}"
-
-PROVIDES += "${PN}-plugin"
-
-PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg"
-RRECOMMENDS_${PN} = "${PN}-plugin"
-
-BRANCH = "master"
-SRCREV = "6a5e4f981112a90a8c19d82bd671da389d2af993"
-
-SRC_URI = " \
-    git://github.com/nemomobile/${PN}.git;branch=${BRANCH} \
-"
+SRC_URI = "git://github.com/nemomobile/libconnman-qt.git;branch=master"
 
 S = "${WORKDIR}/git"
 
-QT_IMPORTS_DIR = "${libdir}/qt4/imports"
-# the plugin target needs to be the same as 'target.path' and 'qmldir.path' in ${S}/plugin/plugin.pro
-PLUGINS_TARGET = "${QT_IMPORTS_DIR}/MeeGo/Connman"
+inherit pkgconfig
 
-EXTRA_QMAKEVARS_PRE = " \
-    CONFIG+=notest \
-"
+EXTRA_QMAKEVARS_PRE = "CONFIG+=notests"
 
 do_configure_prepend() {
     # Hack *.pro variables
     find ${S}/plugin/*.pro -exec sed -i -e 's,$$\[QT_INSTALL_IMPORTS\],${QT_IMPORTS_DIR},g' '{}' ';'
 }
-
 do_install() {
-    export INSTALL_ROOT=${D}
-    oe_runmake install
+    oe_runmake install INSTALL_ROOT=${D}
 }
 
+PACKAGES =+ "${PN}-plugin ${PN}-plugin-dbg"
+
+RDEPENDS_${PN} = "connman"
+RDEPENDS_${PN}-plugin = "${PN}"
+
+RRECOMMENDS_${PN} = "${PN}-plugin"
+
 FILES_${PN} = " \
-    ${libdir}/libconnman-qt4${SOLIBS} \
+    ${libdir}/libconnman-qt*${SOLIBS} \
 "
-
 FILES_${PN}-dev = " \
-    ${includedir}/connman-qt/* \
-    ${libdir}/libconnman-qt4${SOLIBSDEV} \
-    ${libdir}/libconnman-qt4.prl \
-    ${libdir}/pkgconfig/connman-qt4.pc \
-    ${libdir}/connman-qt4.pc \
+    ${includedir}/connman-qt*/* \
+    ${libdir}/libconnman-qt*${SOLIBSDEV} \
+    ${libdir}/libconnman-qt*.prl \
+    ${libdir}/pkgconfig/connman-qt*.pc \
+    ${libdir}/connman-qt*.pc \
 "
-
 FILES_${PN}-plugin = " \
     ${PLUGINS_TARGET}/qmldir \
     ${PLUGINS_TARGET}/lib*.so \
 "
-
 FILES_${PN}-plugin-dbg = " \
     ${PLUGINS_TARGET}/.debug \
     ${PLUGINS_TARGET}/.debug/* \
 "
+
+QT_IMPORTS_DIR = "${libdir}/qt4/imports"
+# the plugin target needs to be the same as 'target.path' and 'qmldir.path' in ${S}/plugin/plugin.pro
+PLUGINS_TARGET = "${QT_IMPORTS_DIR}/MeeGo/Connman"
diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_git.bb b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_git.bb
new file mode 100644
index 0000000..8d8822c
--- /dev/null
+++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_git.bb
@@ -0,0 +1,3 @@ 
+inherit qt4x11
+
+require libconnman-qt.inc
diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb b/meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb
new file mode 100644
index 0000000..7ee4bdb
--- /dev/null
+++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb
@@ -0,0 +1,3 @@ 
+inherit qt4e
+
+require libconnman-qt.inc