Patchwork [meta-oe] libconnman-qt: fixed directory typo

login
mail settings
Submitter eu@felipetonello.com
Date Feb. 20, 2013, 7:08 p.m.
Message ID <1361387338-6553-1-git-send-email-ftonello@cercacor.com>
Download mbox | patch
Permalink /patch/44945/
State Accepted
Commit 65fa455ef0501ebe2b76a3cd9388a945ec74842a
Headers show

Comments

eu@felipetonello.com - Feb. 20, 2013, 7:08 p.m.
From: "Felipe F. Tonello" <ftonello@cercacor.com>

Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com>
---
 ...-to-disable-qml-plugin-and-test-program-t.patch |   37 +++++++++++
 .../libconnman-qt/libconnman-qt_0.4.0.bb           |   69 ++++++++++++++++++++
 ...-to-disable-qml-plugin-and-test-program-t.patch |   37 -----------
 .../libconnmna-qt/libconnman-qt_0.4.0.bb           |   69 --------------------
 4 files changed, 106 insertions(+), 106 deletions(-)
 create mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
 create mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb
 delete mode 100644 meta-oe/recipes-qt/libconnmna-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
 delete mode 100644 meta-oe/recipes-qt/libconnmna-qt/libconnman-qt_0.4.0.bb
Martin Jansa - Feb. 20, 2013, 11:11 p.m.
On Wed, Feb 20, 2013 at 11:08:58AM -0800, eu@felipetonello.com wrote:
> From: "Felipe F. Tonello" <ftonello@cercacor.com>
> 
> Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com>

Thanks, I'll apply this later today, but next time please send patches
with -M for git to detect renames.

> ---
>  ...-to-disable-qml-plugin-and-test-program-t.patch |   37 +++++++++++
>  .../libconnman-qt/libconnman-qt_0.4.0.bb           |   69 ++++++++++++++++++++
>  ...-to-disable-qml-plugin-and-test-program-t.patch |   37 -----------
>  .../libconnmna-qt/libconnman-qt_0.4.0.bb           |   69 --------------------
>  4 files changed, 106 insertions(+), 106 deletions(-)
>  create mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
>  create mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb
>  delete mode 100644 meta-oe/recipes-qt/libconnmna-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
>  delete mode 100644 meta-oe/recipes-qt/libconnmna-qt/libconnman-qt_0.4.0.bb
> 
> diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
> new file mode 100644
> index 0000000..6ec084d
> --- /dev/null
> +++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
> @@ -0,0 +1,37 @@
> +From 3850acef7d914a22e3fc4130ad43b2cc47338d6f Mon Sep 17 00:00:00 2001
> +From: "Felipe F. Tonello" <ftonello@cercacor.com>
> +Date: Mon, 7 Jan 2013 17:13:22 -0800
> +Subject: [PATCH] added flags to disable qml plugin and test program to
> + compile
> +
> +This is usefull when there is no need to compile test program and qml plugin.
> +
> +Upstream-Status: Accepted
> +
> +Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com>
> +---
> + connman-qt.pro |   11 ++++++++++-
> + 1 file changed, 10 insertions(+), 1 deletion(-)
> +
> +diff --git a/connman-qt.pro b/connman-qt.pro
> +index 7d9ec99..425c41f 100644
> +--- a/connman-qt.pro
> ++++ b/connman-qt.pro
> +@@ -1,4 +1,13 @@
> + TEMPLATE = subdirs
> +-SUBDIRS += libconnman-qt test plugin
> ++SUBDIRS += libconnman-qt
> + CONFIG += ordered
> + 
> ++# CONFIG flag to disable test program
> ++!notest {
> ++    SUBDIRS += test
> ++}
> ++
> ++# CONFIG flag to disable qml plugin
> ++!noplugin {
> ++    SUBDIRS += plugin
> ++}
> +-- 
> +1.7.9.5
> +
> diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb
> new file mode 100644
> index 0000000..d15d8d7
> --- /dev/null
> +++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb
> @@ -0,0 +1,69 @@
> +DESCRIPTION = "Qt Library for ConnMan"
> +HOMEPAGE = "https://github.com/nemomobile/libconnman-qt"
> +LICENSE = "Apache-2.0"
> +LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
> +
> +SECTION = "qt/lib"
> +
> +PR = "r0"
> +
> +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"
> +# this matches 0.4.0 tag
> +SRCREV = "3af5bd38d82255942f582398160a5d3354346ca3"
> +
> +SRC_URI = " \
> +  git://github.com/nemomobile/${PN}.git;branch=${BRANCH} \
> +  file://0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch \
> +"
> +
> +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"
> +
> +EXTRA_QMAKEVARS_PRE = " \
> +  CONFIG+=notest \
> +"
> +
> +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
> +}
> +
> +FILES_${PN} = " \
> +  ${libdir}/libconnman-qt4${SOLIBS} \
> +"
> +
> +FILES_${PN}-dev = " \
> +  ${includedir}/connman-qt/* \
> +  ${libdir}/libconnman-qt4${SOLIBSDEV} \
> +  ${libdir}/libconnman-qt4.prl \
> +  ${libdir}/pkgconfig/connman-qt4.pc \
> +  ${libdir}/connman-qt4.pc \
> +"
> +
> +FILES_${PN}-plugin = " \
> +  ${PLUGINS_TARGET}/qmldir \
> +  ${PLUGINS_TARGET}/lib*.so \
> +"
> +
> +FILES_${PN}-plugin-dbg = " \
> +  ${PLUGINS_TARGET}/.debug \
> +  ${PLUGINS_TARGET}/.debug/* \
> +"
> diff --git a/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch b/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
> deleted file mode 100644
> index 6ec084d..0000000
> --- a/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -From 3850acef7d914a22e3fc4130ad43b2cc47338d6f Mon Sep 17 00:00:00 2001
> -From: "Felipe F. Tonello" <ftonello@cercacor.com>
> -Date: Mon, 7 Jan 2013 17:13:22 -0800
> -Subject: [PATCH] added flags to disable qml plugin and test program to
> - compile
> -
> -This is usefull when there is no need to compile test program and qml plugin.
> -
> -Upstream-Status: Accepted
> -
> -Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com>
> ----
> - connman-qt.pro |   11 ++++++++++-
> - 1 file changed, 10 insertions(+), 1 deletion(-)
> -
> -diff --git a/connman-qt.pro b/connman-qt.pro
> -index 7d9ec99..425c41f 100644
> ---- a/connman-qt.pro
> -+++ b/connman-qt.pro
> -@@ -1,4 +1,13 @@
> - TEMPLATE = subdirs
> --SUBDIRS += libconnman-qt test plugin
> -+SUBDIRS += libconnman-qt
> - CONFIG += ordered
> - 
> -+# CONFIG flag to disable test program
> -+!notest {
> -+    SUBDIRS += test
> -+}
> -+
> -+# CONFIG flag to disable qml plugin
> -+!noplugin {
> -+    SUBDIRS += plugin
> -+}
> --- 
> -1.7.9.5
> -
> diff --git a/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt_0.4.0.bb b/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt_0.4.0.bb
> deleted file mode 100644
> index d15d8d7..0000000
> --- a/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt_0.4.0.bb
> +++ /dev/null
> @@ -1,69 +0,0 @@
> -DESCRIPTION = "Qt Library for ConnMan"
> -HOMEPAGE = "https://github.com/nemomobile/libconnman-qt"
> -LICENSE = "Apache-2.0"
> -LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
> -
> -SECTION = "qt/lib"
> -
> -PR = "r0"
> -
> -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"
> -# this matches 0.4.0 tag
> -SRCREV = "3af5bd38d82255942f582398160a5d3354346ca3"
> -
> -SRC_URI = " \
> -  git://github.com/nemomobile/${PN}.git;branch=${BRANCH} \
> -  file://0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch \
> -"
> -
> -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"
> -
> -EXTRA_QMAKEVARS_PRE = " \
> -  CONFIG+=notest \
> -"
> -
> -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
> -}
> -
> -FILES_${PN} = " \
> -  ${libdir}/libconnman-qt4${SOLIBS} \
> -"
> -
> -FILES_${PN}-dev = " \
> -  ${includedir}/connman-qt/* \
> -  ${libdir}/libconnman-qt4${SOLIBSDEV} \
> -  ${libdir}/libconnman-qt4.prl \
> -  ${libdir}/pkgconfig/connman-qt4.pc \
> -  ${libdir}/connman-qt4.pc \
> -"
> -
> -FILES_${PN}-plugin = " \
> -  ${PLUGINS_TARGET}/qmldir \
> -  ${PLUGINS_TARGET}/lib*.so \
> -"
> -
> -FILES_${PN}-plugin-dbg = " \
> -  ${PLUGINS_TARGET}/.debug \
> -  ${PLUGINS_TARGET}/.debug/* \
> -"
> -- 
> 1.7.9.5
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
eu@felipetonello.com - Feb. 21, 2013, 2:16 a.m.
Hi Martin,

On 02/20/2013 03:11 PM, Martin Jansa wrote:
> On Wed, Feb 20, 2013 at 11:08:58AM -0800, eu@felipetonello.com wrote:
>> From: "Felipe F. Tonello" <ftonello@cercacor.com>
>>
>> Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com>
>
> Thanks, I'll apply this later today, but next time please send patches
> with -M for git to detect renames.

That's wired actually, because git recognized it as rename here. But 
still. Sorry for the rework.

Regards,
Felipe


>
>> ---
>>   ...-to-disable-qml-plugin-and-test-program-t.patch |   37 +++++++++++
>>   .../libconnman-qt/libconnman-qt_0.4.0.bb           |   69 ++++++++++++++++++++
>>   ...-to-disable-qml-plugin-and-test-program-t.patch |   37 -----------
>>   .../libconnmna-qt/libconnman-qt_0.4.0.bb           |   69 --------------------
>>   4 files changed, 106 insertions(+), 106 deletions(-)
>>   create mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
>>   create mode 100644 meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb
>>   delete mode 100644 meta-oe/recipes-qt/libconnmna-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
>>   delete mode 100644 meta-oe/recipes-qt/libconnmna-qt/libconnman-qt_0.4.0.bb
>>
>> diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
>> new file mode 100644
>> index 0000000..6ec084d
>> --- /dev/null
>> +++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
>> @@ -0,0 +1,37 @@
>> +From 3850acef7d914a22e3fc4130ad43b2cc47338d6f Mon Sep 17 00:00:00 2001
>> +From: "Felipe F. Tonello" <ftonello@cercacor.com>
>> +Date: Mon, 7 Jan 2013 17:13:22 -0800
>> +Subject: [PATCH] added flags to disable qml plugin and test program to
>> + compile
>> +
>> +This is usefull when there is no need to compile test program and qml plugin.
>> +
>> +Upstream-Status: Accepted
>> +
>> +Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com>
>> +---
>> + connman-qt.pro |   11 ++++++++++-
>> + 1 file changed, 10 insertions(+), 1 deletion(-)
>> +
>> +diff --git a/connman-qt.pro b/connman-qt.pro
>> +index 7d9ec99..425c41f 100644
>> +--- a/connman-qt.pro
>> ++++ b/connman-qt.pro
>> +@@ -1,4 +1,13 @@
>> + TEMPLATE = subdirs
>> +-SUBDIRS += libconnman-qt test plugin
>> ++SUBDIRS += libconnman-qt
>> + CONFIG += ordered
>> +
>> ++# CONFIG flag to disable test program
>> ++!notest {
>> ++    SUBDIRS += test
>> ++}
>> ++
>> ++# CONFIG flag to disable qml plugin
>> ++!noplugin {
>> ++    SUBDIRS += plugin
>> ++}
>> +--
>> +1.7.9.5
>> +
>> diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb
>> new file mode 100644
>> index 0000000..d15d8d7
>> --- /dev/null
>> +++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb
>> @@ -0,0 +1,69 @@
>> +DESCRIPTION = "Qt Library for ConnMan"
>> +HOMEPAGE = "https://github.com/nemomobile/libconnman-qt"
>> +LICENSE = "Apache-2.0"
>> +LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
>> +
>> +SECTION = "qt/lib"
>> +
>> +PR = "r0"
>> +
>> +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"
>> +# this matches 0.4.0 tag
>> +SRCREV = "3af5bd38d82255942f582398160a5d3354346ca3"
>> +
>> +SRC_URI = " \
>> +  git://github.com/nemomobile/${PN}.git;branch=${BRANCH} \
>> +  file://0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch \
>> +"
>> +
>> +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"
>> +
>> +EXTRA_QMAKEVARS_PRE = " \
>> +  CONFIG+=notest \
>> +"
>> +
>> +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
>> +}
>> +
>> +FILES_${PN} = " \
>> +  ${libdir}/libconnman-qt4${SOLIBS} \
>> +"
>> +
>> +FILES_${PN}-dev = " \
>> +  ${includedir}/connman-qt/* \
>> +  ${libdir}/libconnman-qt4${SOLIBSDEV} \
>> +  ${libdir}/libconnman-qt4.prl \
>> +  ${libdir}/pkgconfig/connman-qt4.pc \
>> +  ${libdir}/connman-qt4.pc \
>> +"
>> +
>> +FILES_${PN}-plugin = " \
>> +  ${PLUGINS_TARGET}/qmldir \
>> +  ${PLUGINS_TARGET}/lib*.so \
>> +"
>> +
>> +FILES_${PN}-plugin-dbg = " \
>> +  ${PLUGINS_TARGET}/.debug \
>> +  ${PLUGINS_TARGET}/.debug/* \
>> +"
>> diff --git a/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch b/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
>> deleted file mode 100644
>> index 6ec084d..0000000
>> --- a/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
>> +++ /dev/null
>> @@ -1,37 +0,0 @@
>> -From 3850acef7d914a22e3fc4130ad43b2cc47338d6f Mon Sep 17 00:00:00 2001
>> -From: "Felipe F. Tonello" <ftonello@cercacor.com>
>> -Date: Mon, 7 Jan 2013 17:13:22 -0800
>> -Subject: [PATCH] added flags to disable qml plugin and test program to
>> - compile
>> -
>> -This is usefull when there is no need to compile test program and qml plugin.
>> -
>> -Upstream-Status: Accepted
>> -
>> -Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com>
>> ----
>> - connman-qt.pro |   11 ++++++++++-
>> - 1 file changed, 10 insertions(+), 1 deletion(-)
>> -
>> -diff --git a/connman-qt.pro b/connman-qt.pro
>> -index 7d9ec99..425c41f 100644
>> ---- a/connman-qt.pro
>> -+++ b/connman-qt.pro
>> -@@ -1,4 +1,13 @@
>> - TEMPLATE = subdirs
>> --SUBDIRS += libconnman-qt test plugin
>> -+SUBDIRS += libconnman-qt
>> - CONFIG += ordered
>> -
>> -+# CONFIG flag to disable test program
>> -+!notest {
>> -+    SUBDIRS += test
>> -+}
>> -+
>> -+# CONFIG flag to disable qml plugin
>> -+!noplugin {
>> -+    SUBDIRS += plugin
>> -+}
>> ---
>> -1.7.9.5
>> -
>> diff --git a/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt_0.4.0.bb b/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt_0.4.0.bb
>> deleted file mode 100644
>> index d15d8d7..0000000
>> --- a/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt_0.4.0.bb
>> +++ /dev/null
>> @@ -1,69 +0,0 @@
>> -DESCRIPTION = "Qt Library for ConnMan"
>> -HOMEPAGE = "https://github.com/nemomobile/libconnman-qt"
>> -LICENSE = "Apache-2.0"
>> -LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
>> -
>> -SECTION = "qt/lib"
>> -
>> -PR = "r0"
>> -
>> -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"
>> -# this matches 0.4.0 tag
>> -SRCREV = "3af5bd38d82255942f582398160a5d3354346ca3"
>> -
>> -SRC_URI = " \
>> -  git://github.com/nemomobile/${PN}.git;branch=${BRANCH} \
>> -  file://0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch \
>> -"
>> -
>> -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"
>> -
>> -EXTRA_QMAKEVARS_PRE = " \
>> -  CONFIG+=notest \
>> -"
>> -
>> -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
>> -}
>> -
>> -FILES_${PN} = " \
>> -  ${libdir}/libconnman-qt4${SOLIBS} \
>> -"
>> -
>> -FILES_${PN}-dev = " \
>> -  ${includedir}/connman-qt/* \
>> -  ${libdir}/libconnman-qt4${SOLIBSDEV} \
>> -  ${libdir}/libconnman-qt4.prl \
>> -  ${libdir}/pkgconfig/connman-qt4.pc \
>> -  ${libdir}/connman-qt4.pc \
>> -"
>> -
>> -FILES_${PN}-plugin = " \
>> -  ${PLUGINS_TARGET}/qmldir \
>> -  ${PLUGINS_TARGET}/lib*.so \
>> -"
>> -
>> -FILES_${PN}-plugin-dbg = " \
>> -  ${PLUGINS_TARGET}/.debug \
>> -  ${PLUGINS_TARGET}/.debug/* \
>> -"
>> --
>> 1.7.9.5

Patch

diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
new file mode 100644
index 0000000..6ec084d
--- /dev/null
+++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
@@ -0,0 +1,37 @@ 
+From 3850acef7d914a22e3fc4130ad43b2cc47338d6f Mon Sep 17 00:00:00 2001
+From: "Felipe F. Tonello" <ftonello@cercacor.com>
+Date: Mon, 7 Jan 2013 17:13:22 -0800
+Subject: [PATCH] added flags to disable qml plugin and test program to
+ compile
+
+This is usefull when there is no need to compile test program and qml plugin.
+
+Upstream-Status: Accepted
+
+Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com>
+---
+ connman-qt.pro |   11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/connman-qt.pro b/connman-qt.pro
+index 7d9ec99..425c41f 100644
+--- a/connman-qt.pro
++++ b/connman-qt.pro
+@@ -1,4 +1,13 @@
+ TEMPLATE = subdirs
+-SUBDIRS += libconnman-qt test plugin
++SUBDIRS += libconnman-qt
+ CONFIG += ordered
+ 
++# CONFIG flag to disable test program
++!notest {
++    SUBDIRS += test
++}
++
++# CONFIG flag to disable qml plugin
++!noplugin {
++    SUBDIRS += plugin
++}
+-- 
+1.7.9.5
+
diff --git a/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb
new file mode 100644
index 0000000..d15d8d7
--- /dev/null
+++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qt_0.4.0.bb
@@ -0,0 +1,69 @@ 
+DESCRIPTION = "Qt Library for ConnMan"
+HOMEPAGE = "https://github.com/nemomobile/libconnman-qt"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
+
+SECTION = "qt/lib"
+
+PR = "r0"
+
+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"
+# this matches 0.4.0 tag
+SRCREV = "3af5bd38d82255942f582398160a5d3354346ca3"
+
+SRC_URI = " \
+  git://github.com/nemomobile/${PN}.git;branch=${BRANCH} \
+  file://0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch \
+"
+
+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"
+
+EXTRA_QMAKEVARS_PRE = " \
+  CONFIG+=notest \
+"
+
+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
+}
+
+FILES_${PN} = " \
+  ${libdir}/libconnman-qt4${SOLIBS} \
+"
+
+FILES_${PN}-dev = " \
+  ${includedir}/connman-qt/* \
+  ${libdir}/libconnman-qt4${SOLIBSDEV} \
+  ${libdir}/libconnman-qt4.prl \
+  ${libdir}/pkgconfig/connman-qt4.pc \
+  ${libdir}/connman-qt4.pc \
+"
+
+FILES_${PN}-plugin = " \
+  ${PLUGINS_TARGET}/qmldir \
+  ${PLUGINS_TARGET}/lib*.so \
+"
+
+FILES_${PN}-plugin-dbg = " \
+  ${PLUGINS_TARGET}/.debug \
+  ${PLUGINS_TARGET}/.debug/* \
+"
diff --git a/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch b/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
deleted file mode 100644
index 6ec084d..0000000
--- a/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt/0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch
+++ /dev/null
@@ -1,37 +0,0 @@ 
-From 3850acef7d914a22e3fc4130ad43b2cc47338d6f Mon Sep 17 00:00:00 2001
-From: "Felipe F. Tonello" <ftonello@cercacor.com>
-Date: Mon, 7 Jan 2013 17:13:22 -0800
-Subject: [PATCH] added flags to disable qml plugin and test program to
- compile
-
-This is usefull when there is no need to compile test program and qml plugin.
-
-Upstream-Status: Accepted
-
-Signed-off-by: Felipe F. Tonello <ftonello@cercacor.com>
----
- connman-qt.pro |   11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/connman-qt.pro b/connman-qt.pro
-index 7d9ec99..425c41f 100644
---- a/connman-qt.pro
-+++ b/connman-qt.pro
-@@ -1,4 +1,13 @@
- TEMPLATE = subdirs
--SUBDIRS += libconnman-qt test plugin
-+SUBDIRS += libconnman-qt
- CONFIG += ordered
- 
-+# CONFIG flag to disable test program
-+!notest {
-+    SUBDIRS += test
-+}
-+
-+# CONFIG flag to disable qml plugin
-+!noplugin {
-+    SUBDIRS += plugin
-+}
--- 
-1.7.9.5
-
diff --git a/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt_0.4.0.bb b/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt_0.4.0.bb
deleted file mode 100644
index d15d8d7..0000000
--- a/meta-oe/recipes-qt/libconnmna-qt/libconnman-qt_0.4.0.bb
+++ /dev/null
@@ -1,69 +0,0 @@ 
-DESCRIPTION = "Qt Library for ConnMan"
-HOMEPAGE = "https://github.com/nemomobile/libconnman-qt"
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88"
-
-SECTION = "qt/lib"
-
-PR = "r0"
-
-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"
-# this matches 0.4.0 tag
-SRCREV = "3af5bd38d82255942f582398160a5d3354346ca3"
-
-SRC_URI = " \
-  git://github.com/nemomobile/${PN}.git;branch=${BRANCH} \
-  file://0001-added-flags-to-disable-qml-plugin-and-test-program-t.patch \
-"
-
-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"
-
-EXTRA_QMAKEVARS_PRE = " \
-  CONFIG+=notest \
-"
-
-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
-}
-
-FILES_${PN} = " \
-  ${libdir}/libconnman-qt4${SOLIBS} \
-"
-
-FILES_${PN}-dev = " \
-  ${includedir}/connman-qt/* \
-  ${libdir}/libconnman-qt4${SOLIBSDEV} \
-  ${libdir}/libconnman-qt4.prl \
-  ${libdir}/pkgconfig/connman-qt4.pc \
-  ${libdir}/connman-qt4.pc \
-"
-
-FILES_${PN}-plugin = " \
-  ${PLUGINS_TARGET}/qmldir \
-  ${PLUGINS_TARGET}/lib*.so \
-"
-
-FILES_${PN}-plugin-dbg = " \
-  ${PLUGINS_TARGET}/.debug \
-  ${PLUGINS_TARGET}/.debug/* \
-"