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>
This commit is contained in:
parent
6f0c0167c6
commit
df2fddf9cb
|
@ -3,7 +3,7 @@ SECTION = "libs"
|
||||||
LICENSE = "LGPLv2.1 | GPLv3"
|
LICENSE = "LGPLv2.1 | GPLv3"
|
||||||
HOMEPAGE = "http://qt.nokia.com"
|
HOMEPAGE = "http://qt.nokia.com"
|
||||||
DEPENDS += "directfb tslib"
|
DEPENDS += "directfb tslib"
|
||||||
INC_PR = "r32"
|
INC_PR = "r33"
|
||||||
|
|
||||||
QT_BASE_NAME ?= "qt4-embedded"
|
QT_BASE_NAME ?= "qt4-embedded"
|
||||||
QT_BASE_LIB ?= "libqt-embedded"
|
QT_BASE_LIB ?= "libqt-embedded"
|
||||||
|
|
|
@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
|
||||||
SECTION = "x11/libs"
|
SECTION = "x11/libs"
|
||||||
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
|
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
|
||||||
|
|
||||||
INC_PR = "r29"
|
INC_PR = "r30"
|
||||||
|
|
||||||
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
|
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
|
||||||
QT_GLFLAGS_qemux86 = "-opengl"
|
QT_GLFLAGS_qemux86 = "-opengl"
|
||||||
|
|
|
@ -50,7 +50,7 @@ python __anonymous () {
|
||||||
${libdir}/lib%(name)s${QT_LIBINFIX}.so
|
${libdir}/lib%(name)s${QT_LIBINFIX}.so
|
||||||
${includedir}/${QT_DIR_NAME}/%(incname)s
|
${includedir}/${QT_DIR_NAME}/%(incname)s
|
||||||
${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals(), d)
|
${libdir}/pkgconfig/%(name)s${QT_LIBINFIX}.pc""" % locals(), d)
|
||||||
bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so.*" % locals(), d)
|
bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s${QT_LIBINFIX}.so*" % locals(), d)
|
||||||
bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg", d)
|
bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg", d)
|
||||||
lib_packages.append(pkg)
|
lib_packages.append(pkg)
|
||||||
dev_packages.append("%s-dev" % pkg)
|
dev_packages.append("%s-dev" % pkg)
|
||||||
|
@ -67,7 +67,7 @@ python __anonymous () {
|
||||||
${libdir}/lib%(name)s.so
|
${libdir}/lib%(name)s.so
|
||||||
${includedir}/${QT_DIR_NAME}/%(incname)s
|
${includedir}/${QT_DIR_NAME}/%(incname)s
|
||||||
${libdir}/pkgconfig/%(name)s.pc""" % locals(), d)
|
${libdir}/pkgconfig/%(name)s.pc""" % locals(), d)
|
||||||
bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so.*" % locals(), d)
|
bb.data.setVar("FILES_%s-dbg" % pkg, "${libdir}/.debug/lib%(name)s.so*" % locals(), d)
|
||||||
bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg", d)
|
bb.data.setVar("RRECOMMENDS_%s-dbg" % pkg, "${PN}-dbg", d)
|
||||||
lib_packages.append(pkg)
|
lib_packages.append(pkg)
|
||||||
dev_packages.append("%s-dev" % pkg)
|
dev_packages.append("%s-dev" % pkg)
|
||||||
|
@ -102,7 +102,7 @@ OTHER_PACKAGES = "\
|
||||||
${QT_BASE_NAME}-qml-plugins"
|
${QT_BASE_NAME}-qml-plugins"
|
||||||
|
|
||||||
PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}"
|
PACKAGES += "${LIB_PACKAGES} ${DEV_PACKAGES} ${DBG_PACKAGES} ${OTHER_PACKAGES}"
|
||||||
PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-fonts-*"
|
PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-* ${QT_BASE_NAME}-fonts-*"
|
||||||
|
|
||||||
ALLOW_EMPTY_${PN} = "1"
|
ALLOW_EMPTY_${PN} = "1"
|
||||||
ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1"
|
ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1"
|
||||||
|
@ -152,6 +152,7 @@ FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"
|
||||||
FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa"
|
FILES_${QT_BASE_NAME}-fonts-pfa = "${libdir}/fonts/*.pfa"
|
||||||
FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb"
|
FILES_${QT_BASE_NAME}-fonts-pfb = "${libdir}/fonts/*.pfb"
|
||||||
FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf"
|
FILES_${QT_BASE_NAME}-fonts-qpf = "${libdir}/fonts/*.qpf"
|
||||||
|
FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts/README ${libdir}/fonts/fontdir"
|
||||||
FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts"
|
FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/lconvert ${bindir}/qm2ts"
|
||||||
FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts"
|
FILES_${QT_BASE_NAME}-linguist-dbg = "${bindir}/.debug/*linguist* ${bindir}/.debug/lrelease ${bindir}/.debug/lupdate ${bindir}/.debug/lconvert ${bindir}/.debug/qm2ts"
|
||||||
FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool"
|
FILES_${QT_BASE_NAME}-pixeltool = "${bindir}/pixeltool"
|
||||||
|
@ -166,7 +167,7 @@ FILES_${QT_BASE_NAME}-mkspecs = "${datadir}/${QT_DIR_NAME}/mkspecs/
|
||||||
FILES_${QT_BASE_NAME}-xmlpatterns = "${bindir}/xmlpatterns*"
|
FILES_${QT_BASE_NAME}-xmlpatterns = "${bindir}/xmlpatterns*"
|
||||||
FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*"
|
FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*"
|
||||||
FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*"
|
FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*"
|
||||||
FILES_${QT_BASE_NAME}-qml-plugins-dbg = "${libdir}/${QT_DIR_NAME}/imports/*/*/*/.debug/* ${libdir}/${QT_DIR_NAME}/imports/*/.debug"
|
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"
|
||||||
|
|
||||||
do_configure() {
|
do_configure() {
|
||||||
unset QMAKESPEC
|
unset QMAKESPEC
|
||||||
|
@ -228,8 +229,10 @@ python populate_packages_prepend() {
|
||||||
phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
|
phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d)
|
||||||
phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
|
phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d)
|
||||||
import os;
|
import os;
|
||||||
if os.path.exists(phrasebook_dir):
|
if os.path.exists("%s%s" % (bb.data.expand('${D}',d), phrasebook_dir)):
|
||||||
do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
|
do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '${PN} phrasebook for %s', extra_depends='' )
|
||||||
|
else:
|
||||||
|
bb.note("The path does not exist:", bb.data.expand('${D}', d), phrasebook_dir)
|
||||||
|
|
||||||
# Package all the plugins and their -dbg version and create a meta package
|
# Package all the plugins and their -dbg version and create a meta package
|
||||||
def qtopia_split(path, name, glob):
|
def qtopia_split(path, name, glob):
|
||||||
|
|
Loading…
Reference in New Issue