diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2011-10-03 01:46:11 +0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-30 16:37:57 +0000 |
commit | df2fddf9cbaba4b8b474e9859d54c5cd012f9842 (patch) | |
tree | 3facd60e6e608188b28a70661c70df0a61d77344 /meta | |
parent | 6f0c0167c6f1856a8add5d609baa71bfb0a000fb (diff) | |
download | poky-df2fddf9cbaba4b8b474e9859d54c5cd012f9842.tar.gz |
qt4: packaging fixup
Improve packaging:
* Add phrasebook packages to DYNAMIC_PACKAGES
* Correct phrasebook packages generation
* Include more files into -dbg packages
* Package fontdir and fonts README.
(From OE-Core rev: 4e3c29dd90f583cafe7a7fc863efb3720096d67b)
(From OE-Core rev: 8fbad61dc62bdd439a55bcca09601bed28fcd3af)
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded.inc | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 13 |
3 files changed, 10 insertions, 7 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index a814c13bff..c4e2b488c7 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc | |||
@@ -3,7 +3,7 @@ SECTION = "libs" | |||
3 | LICENSE = "LGPLv2.1 | GPLv3" | 3 | LICENSE = "LGPLv2.1 | GPLv3" |
4 | HOMEPAGE = "http://qt.nokia.com" | 4 | HOMEPAGE = "http://qt.nokia.com" |
5 | DEPENDS += "directfb tslib" | 5 | DEPENDS += "directfb tslib" |
6 | INC_PR = "r32" | 6 | INC_PR = "r33" |
7 | 7 | ||
8 | QT_BASE_NAME ?= "qt4-embedded" | 8 | QT_BASE_NAME ?= "qt4-embedded" |
9 | QT_BASE_LIB ?= "libqt-embedded" | 9 | QT_BASE_LIB ?= "libqt-embedded" |
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 3483db57f9..93feb0ed34 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc | |||
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com" | |||
5 | SECTION = "x11/libs" | 5 | SECTION = "x11/libs" |
6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" | 6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" |
7 | 7 | ||
8 | INC_PR = "r29" | 8 | INC_PR = "r30" |
9 | 9 | ||
10 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " | 10 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " |
11 | QT_GLFLAGS_qemux86 = "-opengl" | 11 | QT_GLFLAGS_qemux86 = "-opengl" |
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 7f3e1a4785..7d91f19c4f 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -50,7 +50,7 @@ python __anonymous () { | |||
50 | ${libdir}/lib%(name)s${QT_LIBINFIX}.so | 50 | ${libdir}/lib%(name)s${QT_LIBINFIX}.so |
51 | ${includedir}/${QT_DIR_NAME}/%(incname)s | 51 | ${includedir}/${QT_DIR_NAME}/%(incname)s |
52 | ${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals(), d) | 52 | ${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals(), d) |
53 | bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d) | 53 | bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so*" % locals(), d) |
54 | bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg", d) | 54 | bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg", d) |
55 | lib_packages.append(pkg) | 55 | lib_packages.append(pkg) |
56 | dev_packages.append("%s-dev" % pkg) | 56 | dev_packages.append("%s-dev" % pkg) |
@@ -67,7 +67,7 @@ python __anonymous () { | |||
67 | ${libdir}/lib%(name)s.so | 67 | ${libdir}/lib%(name)s.so |
68 | ${includedir}/${QT_DIR_NAME}/%(incname)s | 68 | ${includedir}/${QT_DIR_NAME}/%(incname)s |
69 | ${libdir}/pkgconfig/%(name)s.pc""" % locals(), d) | 69 | ${libdir}/pkgconfig/%(name)s.pc""" % locals(), d) |
70 | bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so.*" % locals(), d) | 70 | bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so*" % locals(), d) |
71 | bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg", d) | 71 | bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg", d) |
72 | lib_packages.append(pkg) | 72 | lib_packages.append(pkg) |
73 | dev_packages.append("%s-dev" % pkg) | 73 | dev_packages.append("%s-dev" % pkg) |
@@ -102,7 +102,7 @@ OTHER_PACKAGES = "\ | |||
102 | ${QT_BASE_NAME}-qml-plugins" | 102 | ${QT_BASE_NAME}-qml-plugins" |
103 | 103 | ||
104 | PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}" | 104 | PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}" |
105 | PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-*" | 105 | PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-* ${QT_BASE_NAME}-fonts-*" |
106 | 106 | ||
107 | ALLOW_EMPTY_${PN} = "1" | 107 | ALLOW_EMPTY_${PN} = "1" |
108 | ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1" | 108 | ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1" |
@@ -152,6 +152,7 @@ FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf" | |||
152 | FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa" | 152 | FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa" |
153 | FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb" | 153 | FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb" |
154 | FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf" | 154 | FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf" |
155 | FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts/README ${libdir}/fonts/fontdir" | ||
155 | FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts" | 156 | FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts" |
156 | FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts" | 157 | FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts" |
157 | FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool" | 158 | FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool" |
@@ -166,7 +167,7 @@ FILES_${QT_BASE_NAME}-mkspecs = "${datadir}/${QT_DIR_NAME}/mkspecs/ | |||
166 | FILES_${QT_BASE_NAME}-xmlpatterns = "${bindir}/xmlpatterns*" | 167 | FILES_${QT_BASE_NAME}-xmlpatterns = "${bindir}/xmlpatterns*" |
167 | FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*" | 168 | FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*" |
168 | FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*" | 169 | FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*" |
169 | FILES_${QT_BASE_NAME}-qml-plugins-dbg = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug" | 170 | FILES_${QT_BASE_NAME}-qml-plugins-dbg = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/.debug" |
170 | 171 | ||
171 | do_configure() { | 172 | do_configure() { |
172 | unset QMAKESPEC | 173 | unset QMAKESPEC |
@@ -228,8 +229,10 @@ python populate_packages_prepend() { | |||
228 | phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d) | 229 | phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d) |
229 | phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d) | 230 | phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d) |
230 | import os; | 231 | import os; |
231 | if os.path.exists(phrasebook_dir): | 232 | if os.path.exists("%s%s" % (bb.data.expand('${D}',d), phrasebook_dir)): |
232 | do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) | 233 | do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' ) |
234 | else: | ||
235 | bb.note("The path does not exist:", bb.data.expand('${D}', d), phrasebook_dir) | ||
233 | 236 | ||
234 | # Package all the plugins and their -dbg version and create a meta package | 237 | # Package all the plugins and their -dbg version and create a meta package |
235 | def qtopia_split(path, name, glob): | 238 | def qtopia_split(path, name, glob): |