aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2014-01-20 16:08:39 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2014-02-18 09:22:38 +0100
commit38b3de4ad59ffe59ba74b7357f9899271edf1d5f (patch)
treebcb1bb48ad2e5c3a956d0ea581e23966aabbdc97
parent2397f51915252c00c4b86dc324feec76f61dcf22 (diff)
downloadmeta-openembedded-contrib-38b3de4ad59ffe59ba74b7357f9899271edf1d5f.tar.gz
meta-openembedded-contrib-38b3de4ad59ffe59ba74b7357f9899271edf1d5f.tar.bz2
meta-openembedded-contrib-38b3de4ad59ffe59ba74b7357f9899271edf1d5f.zip
libconnman-qt: update to 1.0.46, add recipe for qte
* 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. * Don't overwrite EXTRA_QMAKEVARS_PRE, because qt4e.bbclass uses it to pass on QT_LIBINFX. * Generalize QT_IMPORTS_DIR to make it valid for qte. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-qt/libconnman-qt/libconnman-qt.inc (renamed from meta-oe/recipes-qt/libconnman-qt/libconnman-qt_1.0.7.bb)61
-rw-r--r--meta-oe/recipes-qt/libconnman-qt/libconnman-qt_git.bb3
-rw-r--r--meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb3
3 files changed, 30 insertions, 37 deletions
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
index 2288c4f97b..77e70e8998 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}/${QT_DIR_NAME}/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 0000000000..8d8822c5e1
--- /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 0000000000..7ee4bdb081
--- /dev/null
+++ b/meta-oe/recipes-qt/libconnman-qt/libconnman-qte_git.bb
@@ -0,0 +1,3 @@
+inherit qt4e
+
+require libconnman-qt.inc