From 5bd832ff07a62f1c152b71a8e11b7553b336185a Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 21 Jan 2008 21:39:34 +0000 Subject: packages/qt4/qt_packaging.inc: Fix the splitting of the translation packages The variable inside the package name did not get expanded, let us expand it ourselves. --- packages/qt4/qt_packaging.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 63d314c6c5..ca5e93be34 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -133,8 +133,9 @@ FILES_${QT_BASE_NAME}-demos = "${bindir}/qtdemo ${bindir}/${QT_DI FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts" python populate_packages_prepend() { - translationdir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) - do_split_packages(d, translationdir, '^qt_(.*)\.qm$', '${QT_DIR_NAME}-translation-%s', '{PN} translation for %s', extra_depends='' ) + translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) + translation_name = bb.data.expand('${QT_DIR_NAME}-translation-%s', d) + do_split_packages(d, translation_dir, '^qt_(.*)\.qm$', translation_name, '{PN} translation for %s', extra_depends='' ) } -- cgit v1.2.3 From 8fc769e4525e23f60abadddeff816708bf6d3be6 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 21 Jan 2008 21:45:41 +0000 Subject: packages/qt4/qt_packaging.inc: Package the phrasebooks --- packages/qt4/qt_packaging.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index ca5e93be34..9b93c9a8ef 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -136,6 +136,11 @@ python populate_packages_prepend() { translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) translation_name = bb.data.expand('${QT_DIR_NAME}-translation-%s', d) do_split_packages(d, translation_dir, '^qt_(.*)\.qm$', translation_name, '{PN} translation for %s', extra_depends='' ) + + phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d) + phrasebook_name = bb.data.expand('${QT_DIR_NAME}-phrasebook-%s', d) + do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '{PN} phrasebook for %s', extra_depends='' ) + } -- cgit v1.2.3 From 44da1a0957957fe55efd6ddef775c4ec23279d77 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 22 Jan 2008 01:53:49 +0000 Subject: linux-openmoko: remove some useless versions --- .../linux/linux-openmoko-devel_svn+2.6.23.1.bb | 68 ---------------------- .../linux/linux-openmoko-devel_svn+2.6.24-rc6.bb | 68 ---------------------- 2 files changed, 136 deletions(-) delete mode 100644 packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb delete mode 100644 packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb diff --git a/packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb b/packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb deleted file mode 100644 index 5cca31d74b..0000000000 --- a/packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb +++ /dev/null @@ -1,68 +0,0 @@ -require linux.inc -require linux-openmoko.inc - -DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko" -VANILLA_VERSION = "2.6.23" -#KERNEL_VERSION = "2.6.23-rc9" -KERNEL_RELEASE = "2.6.23.1" - -# If you use a rc, you will need to use this: -#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}-moko11+svnr${SRCREV}" - -KERNEL_VERSION = "${KERNEL_RELEASE}" -PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r3" - -KERNEL_IMAGETYPE = "uImage" -UBOOT_ENTRYPOINT = "30008000" - -############################################################## -# source and patches -# -SRCREV_FORMAT = "patches" -SRCREV = "3140" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_VERSION}.bz2;patch=1 \ - svn://svn.openmoko.org/branches/src/target/kernel/2.6.23.x;module=patches;proto=http;name=patches \ - file://squashfs-2.6.23.patch;patch=1 \ - file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1 \ -# file://printascii-2.6.23.patch;patch=1 \ - file://hack-gta02-cpu.patch;patch=1 \ - file://fix-gta01-flowcontrol2-2.6.23.patch;patch=1 \ - file://defconfig-2.6.23.1 \ - file://logo_linux_clut224.ppm" -S = "${WORKDIR}/linux-${VANILLA_VERSION}" - -############################################################## -# kernel image resides on a seperate flash partition (for now) -# -FILES_kernel-image = "" -ALLOW_EMPTY = "1" - -COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02' - -CMDLINE = "unused -- bootloader passes ATAG list" - -############################################################### -# module configs specific to this kernel -# - -# usb -module_autoload_ohci-hcd = "ohci-hcd" -module_autoload_hci_usb = "hci_usb" -module_autoload_g_ether = "g_ether" -# audio -module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" -# sd/mmc -module_autoload_s3cmci = "s3cmci" - -do_prepatch() { - mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av - mv patches patches.openmoko - mv .pc .pc.old - mv ${WORKDIR}/defconfig-${KERNEL_VERSION} ${WORKDIR}/defconfig -} - -addtask prepatch after do_unpack before do_patch diff --git a/packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb b/packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb deleted file mode 100644 index 733cd3fb3b..0000000000 --- a/packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb +++ /dev/null @@ -1,68 +0,0 @@ -require linux.inc -require linux-openmoko.inc - -DESCRIPTION = "Linux 2.6.x (development) kernel for FIC SmartPhones shipping w/ OpenMoko" -VANILLA_VERSION = "2.6.23" -KERNEL_RELEASE = "2.6.24-rc6" - -KERNEL_VERSION = "${KERNEL_RELEASE}" - -# If you use a rc, you will need to use this: -PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" -#PV = "${KERNEL_RELEASE}+svnr${SRCREV}" -PR = "r2" - -KERNEL_IMAGETYPE = "uImage" -UBOOT_ENTRYPOINT = "30008000" - -############################################################## -# source and patches -# -SRCREV_FORMAT = "patches" -SRCREV = "3741" - -SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ - ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/testing/patch-${KERNEL_VERSION}.bz2 \ - svn://svn.openmoko.org/branches/src/target/kernel/2.6.24.x;module=patches;proto=http;name=patches \ -# file://squashfs-2.6.23.patch;patch=1 \ -# file://fix-EVIOCGRAB-semantics-2.6.22.5.patch;patch=1 \ -# file://printascii-2.6.23.patch;patch=1 \ -# file://hack-gta02-cpu.patch;patch=1 \ -# file://fix-gta01-flowcontrol2-2.6.23.patch;patch=1 \ - file://defconfig-${KERNEL_VERSION} \ - file://logo_linux_clut224.ppm" -S = "${WORKDIR}/linux-${VANILLA_VERSION}" - -############################################################## -# kernel image resides on a seperate flash partition (for now) -# -FILES_kernel-image = "" -ALLOW_EMPTY = "1" - -COMPATIBLE_HOST = "arm.*-linux" -COMPATIBLE_MACHINE = 'fic-gta01|fic-gta02' - -CMDLINE = "unused -- bootloader passes ATAG list" - -############################################################### -# module configs specific to this kernel -# - -# usb -module_autoload_ohci-hcd = "ohci-hcd" -module_autoload_hci_usb = "hci_usb" -module_autoload_g_ether = "g_ether" -# audio -module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753" -# sd/mmc -module_autoload_s3cmci = "s3cmci" - -do_prepatch() { - cd ${S} && patch -p1 < ${WORKDIR}/patch-${KERNEL_VERSION} - mv ${WORKDIR}/patches ${S}/patches && cd ${S} && quilt push -av - mv patches patches.openmoko - mv .pc .pc.old - mv ${WORKDIR}/defconfig-${KERNEL_VERSION} ${WORKDIR}/defconfig -} - -addtask prepatch after do_unpack before do_patch -- cgit v1.2.3 From 0db3088a5bc27d07aaf6c4ccaeda1b020b859961 Mon Sep 17 00:00:00 2001 From: John Lee Date: Tue, 22 Jan 2008 04:06:13 +0000 Subject: task-openmoko-toolchain-host: fix duplicated text. * duplicated text due to brain damaged patch usage. --- packages/meta/external-toolchain.bb | 2 +- packages/tasks/task-openmoko-toolchain-host.bb | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/packages/meta/external-toolchain.bb b/packages/meta/external-toolchain.bb index 47d9a93a15..69f16b10df 100644 --- a/packages/meta/external-toolchain.bb +++ b/packages/meta/external-toolchain.bb @@ -15,7 +15,7 @@ PROVIDES = "\ virtual/linux-libc-headers \ " -RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++" +#RPROVIDES = "glibc-utils libsegfault glibc-thread-db libgcc-dev libstdc++-dev libstdc++" PACKAGES_DYNAMIC = "glibc-gconv-*" PR = "r1" diff --git a/packages/tasks/task-openmoko-toolchain-host.bb b/packages/tasks/task-openmoko-toolchain-host.bb index 31ac3bb746..788152c6ca 100644 --- a/packages/tasks/task-openmoko-toolchain-host.bb +++ b/packages/tasks/task-openmoko-toolchain-host.bb @@ -11,16 +11,3 @@ PACKAGES = "${PN}" RDEPENDS_${PN} += "\ openmoko-sample2-src \ " -require task-sdk-host.bb - -DESCRIPTION = "Packages for a standalone OpenMoko SDK or external toolchain" -LICENSE = "MIT" -ALLOW_EMPTY = "1" - -PR = "r0" - -PACKAGES = "${PN}" - -RDEPENDS_${PN} += "\ - openmoko-sample2-src \ -" -- cgit v1.2.3 From 95d65bf80c917be7ec810dc18c0e7ff72a38e16c Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 22 Jan 2008 08:08:37 +0000 Subject: packages/qt4/qt_packaging.inc: Attempt to package all possible plugins properly --- packages/qt4/qt_packaging.inc | 97 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 83 insertions(+), 14 deletions(-) diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 9b93c9a8ef..58b3e1314e 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -10,11 +10,15 @@ NONDEV_PACKAGES += "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network ${QT_BASE_NAME}-pixeltool ${QT_BASE_NAME}-dbus \ ${QT_BASE_NAME}-plugins-accessible \ ${QT_BASE_NAME}-plugins-codecs \ + ${QT_BASE_NAME}-plugins-decorations \ ${QT_BASE_NAME}-plugins-designer \ + ${QT_BASE_NAME}-plugins-gfxdrivers \ + ${QT_BASE_NAME}-plugins-mousedrivers \ + ${QT_BASE_NAME}-plugins-iconengines \ ${QT_BASE_NAME}-plugins-imageformats \ - ${QT_BASE_NAME}-plugins-sqldrivers \ ${QT_BASE_NAME}-plugins-inputmethods \ - ${QT_BASE_NAME}-plugins-iconengines \ + ${QT_BASE_NAME}-plugins-sqldrivers \ + ${QT_BASE_NAME}-plugins-styles \ ${QT_BASE_NAME}-fonts " DEV_PACKAGES += "${QT_BASE_LIB}core4-dev \ @@ -46,7 +50,18 @@ DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg \ ${QT_BASE_LIB}assistantclient4-dbg \ ${QT_BASE_LIB}script4-dbg \ ${QT_BASE_LIB}dbus4-dbg \ - ${QT_BASE_LIB}opengl4-dbg " + ${QT_BASE_LIB}opengl4-dbg \ + ${QT_BASE_NAME}-plugins-accessible-dbg \ + ${QT_BASE_NAME}-plugins-codecs-dbg \ + ${QT_BASE_NAME}-plugins-decorations-dbg \ + ${QT_BASE_NAME}-plugins-designer-dbg \ + ${QT_BASE_NAME}-plugins-gfxdrivers-dbg \ + ${QT_BASE_NAME}-plugins-mousedrivers-dbg \ + ${QT_BASE_NAME}-plugins-iconengines-dbg \ + ${QT_BASE_NAME}-plugins-imageformats-dbg \ + ${QT_BASE_NAME}-plugins-inputmethods-dbg \ + ${QT_BASE_NAME}-plugins-sqldrivers-dbg \ + ${QT_BASE_NAME}-plugins-styles-dbg" PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}" @@ -54,7 +69,7 @@ PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}" ALLOW_EMPTY_${PN} = "1" FILES_${PN} = "" FILES_${PN}-dev = " ${includedir}/${QT_DIR_NAME}/Qt/*" -FILES_${PN}-dbg = "${bindir}/*/.debug ${libdir}/${QT_DIR_NAME}/plugins/*/.debug/*.so" +FILES_${PN}-dbg = "${bindir}/*/.debug " RDEPENDS_${PN} = "${NONDEV_PACKAGES}" RDEPENDS_${PN}-dev = "${DEV_PACKAGES}" RDEPENDS_${PN}-dbg = "${DBG_PACKAGES}" @@ -111,14 +126,29 @@ FILES_${QT_BASE_LIB}opengl4-dev = "${@qt_default_dev('OpenGL')}" FILES_${QT_BASE_LIB}opengl4-dbg = "${libdir}/.debug/libQtOpenGL*" FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/libQtUiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/QtUiTools${QT_LIBINFIX}.pc" - -FILES_${QT_BASE_NAME}-plugins-accessible = "${libdir}/${QT_DIR_NAME}/plugins/accessible/*.so" -FILES_${QT_BASE_NAME}-plugins-codecs = "${libdir}/${QT_DIR_NAME}/plugins/codecs/*.so" -FILES_${QT_BASE_NAME}-plugins-designer = "${libdir}/${QT_DIR_NAME}/plugins/designer/*.so" -FILES_${QT_BASE_NAME}-plugins-imageformats = "${libdir}/${QT_DIR_NAME}/plugins/imageformats/*.so" -FILES_${QT_BASE_NAME}-plugins-sqldrivers = "${libdir}/${QT_DIR_NAME}/plugins/sqldrivers/*.so" -FILES_${QT_BASE_NAME}-plugins-inputmethods = "${libdir}/${QT_DIR_NAME}/plugins/inputmethods/*.so" -FILES_${QT_BASE_NAME}-plugins-iconengines = "${libdir}/${QT_DIR_NAME}/plugins/iconengines/*.so" +# meta packages for the plugins +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-accessible = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-accessible-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-codecs = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-codecs-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-decorations = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-decorations-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-designer = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-designer-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-gfxdrivers = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-gfxdrivers-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-mousedrivers = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-mousedrivers-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-iconengines = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-iconengines-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-imageformats = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-imageformats-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-inputmethods = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-inputmethods-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-sqldrivers = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-sqldrivers-dbg = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-styles = "1" +ALLOW_EMPTY_${QT_BASE_NAME}-plugins-styles-dbg = "1" FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant*" FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*" @@ -134,13 +164,52 @@ FILES_${QT_BASE_NAME}-fonts = "${libdir}/fonts" python populate_packages_prepend() { translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d) - translation_name = bb.data.expand('${QT_DIR_NAME}-translation-%s', d) + translation_name = bb.data.expand('${QT_BASE_NAME}-translation-%s', d) do_split_packages(d, translation_dir, '^qt_(.*)\.qm$', translation_name, '{PN} translation for %s', extra_depends='' ) phrasebook_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/phrasebooks/', d) - phrasebook_name = bb.data.expand('${QT_DIR_NAME}-phrasebook-%s', d) + phrasebook_name = bb.data.expand('${QT_BASE_NAME}-phrasebook-%s', d) do_split_packages(d, phrasebook_dir, '^(.*)\.qph$', phrasebook_name, '{PN} phrasebook for %s', extra_depends='' ) + # Package all the plugins and their -dbg version and create a meta package + import os + def qtopia_split(path, name, glob, meta_name): + """ + Split the package into a normal and -dbg package and then add the + new packages to the meta package. + """ + plugin_dir = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/' % path, d) + plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug/' % path, d) + if not os.path.exists("%s%s" % (bb.data.expand('${D}',d), plugin_dir)): + bb.note("The path does not exist:", bb.data.expand('${D}', d), plugin_dir) + return + + plugin_name = bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name, d) + plugin_name_dbg= bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s-dbg' % name, d) + print plugin_name, plugin_name_dbg, glob + + dev_packages = [] + dev_hook = lambda a,pkg,b,c,d:dev_packages.append(pkg) + dbg_packages = [] + dbg_hook = lambda a,pkg,b,c,d:dbg_packages.append(pkg) + do_split_packages(d, plugin_dir, glob, plugin_name, '{PN} %s for %%s' % name, extra_depends='', hook=dev_hook) + do_split_packages(d, plugin_dir_dbg, glob, plugin_name_dbg, '{PN} %s for %%s' % name, extra_depends='', hook=dbg_hook) + + print meta_name, dev_packages, dbg_packages + bb.data.setVar("RDEPENDS_%s" % meta_name, " ".join(dev_packages), d) + bb.data.setVar("RDEPENDS_%s-dbg" % meta_name, " ".join(dbg_packages), d) + + qtopia_split('accessible', 'accessible', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-accessible") + qtopia_split('codecs', 'codec', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-codecs") + qtopia_split('decorations', 'decoration', '^libqdecoration(.*)\.so$', "${QT_BASE_NAME}-plugins-decorations") + qtopia_split('designer', 'designer', '^lib(.*)\.so$', "${QT_BASE_NAME}-plugins-designer") + qtopia_split('gfxdrivers', 'gfxdriver', '^libqgfx(.*)\.so$', "${QT_BASE_NAME}-plugins-gfxdrivers") + qtopia_split('mousedrivers','mousedriver', '^libq(.*)mousedriver\.so$', "${QT_BASE_NAME}-plugins-mousedrivers") + qtopia_split('iconengines', 'iconengine', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-iconengines") + qtopia_split('imageformats','imageformat', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-imageformats") + qtopia_split('inputmethods','inputmethod', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-inputmethods") + qtopia_split('sqldrivers', 'sqldriver', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-sqldrivers") + qtopia_split('styles', 'style', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-styles") } -- cgit v1.2.3 From d740dd9bb2c29a300333277986fc50d9eeb8c2d5 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 22 Jan 2008 08:33:44 +0000 Subject: packages/qt4/qt_packaging.inc: Remove the attempt to create the meta packages this way It didn't work because the RDEPENDS were not available in the package_write task anymore. We need to create a meta task where all plugins are referred to in some other way. --- packages/qt4/qt_packaging.inc | 76 ++++++++----------------------------------- 1 file changed, 14 insertions(+), 62 deletions(-) diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 58b3e1314e..931c5671d9 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -8,17 +8,6 @@ NONDEV_PACKAGES += "${QT_BASE_LIB}core4 ${QT_BASE_LIB}gui4 ${QT_BASE_LIB}network ${QT_BASE_NAME}-demos ${QT_BASE_NAME}-examples \ ${QT_BASE_NAME}-linguist \ ${QT_BASE_NAME}-pixeltool ${QT_BASE_NAME}-dbus \ - ${QT_BASE_NAME}-plugins-accessible \ - ${QT_BASE_NAME}-plugins-codecs \ - ${QT_BASE_NAME}-plugins-decorations \ - ${QT_BASE_NAME}-plugins-designer \ - ${QT_BASE_NAME}-plugins-gfxdrivers \ - ${QT_BASE_NAME}-plugins-mousedrivers \ - ${QT_BASE_NAME}-plugins-iconengines \ - ${QT_BASE_NAME}-plugins-imageformats \ - ${QT_BASE_NAME}-plugins-inputmethods \ - ${QT_BASE_NAME}-plugins-sqldrivers \ - ${QT_BASE_NAME}-plugins-styles \ ${QT_BASE_NAME}-fonts " DEV_PACKAGES += "${QT_BASE_LIB}core4-dev \ @@ -50,18 +39,7 @@ DBG_PACKAGES += "${QT_BASE_LIB}core4-dbg \ ${QT_BASE_LIB}assistantclient4-dbg \ ${QT_BASE_LIB}script4-dbg \ ${QT_BASE_LIB}dbus4-dbg \ - ${QT_BASE_LIB}opengl4-dbg \ - ${QT_BASE_NAME}-plugins-accessible-dbg \ - ${QT_BASE_NAME}-plugins-codecs-dbg \ - ${QT_BASE_NAME}-plugins-decorations-dbg \ - ${QT_BASE_NAME}-plugins-designer-dbg \ - ${QT_BASE_NAME}-plugins-gfxdrivers-dbg \ - ${QT_BASE_NAME}-plugins-mousedrivers-dbg \ - ${QT_BASE_NAME}-plugins-iconengines-dbg \ - ${QT_BASE_NAME}-plugins-imageformats-dbg \ - ${QT_BASE_NAME}-plugins-inputmethods-dbg \ - ${QT_BASE_NAME}-plugins-sqldrivers-dbg \ - ${QT_BASE_NAME}-plugins-styles-dbg" + ${QT_BASE_LIB}opengl4-dbg" PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}" @@ -126,29 +104,6 @@ FILES_${QT_BASE_LIB}opengl4-dev = "${@qt_default_dev('OpenGL')}" FILES_${QT_BASE_LIB}opengl4-dbg = "${libdir}/.debug/libQtOpenGL*" FILES_${QT_BASE_LIB}uitools4-dev = "${libdir}/libQtUiTools* ${includedir}/${QT_DIR_NAME}/QtUiTools* ${libdir}/pkgconfig/QtUiTools${QT_LIBINFIX}.pc" -# meta packages for the plugins -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-accessible = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-accessible-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-codecs = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-codecs-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-decorations = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-decorations-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-designer = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-designer-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-gfxdrivers = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-gfxdrivers-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-mousedrivers = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-mousedrivers-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-iconengines = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-iconengines-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-imageformats = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-imageformats-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-inputmethods = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-inputmethods-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-sqldrivers = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-sqldrivers-dbg = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-styles = "1" -ALLOW_EMPTY_${QT_BASE_NAME}-plugins-styles-dbg = "1" FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant*" FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*" @@ -173,7 +128,7 @@ python populate_packages_prepend() { # Package all the plugins and their -dbg version and create a meta package import os - def qtopia_split(path, name, glob, meta_name): + def qtopia_split(path, name, glob): """ Split the package into a normal and -dbg package and then add the new packages to the meta package. @@ -195,21 +150,18 @@ python populate_packages_prepend() { do_split_packages(d, plugin_dir, glob, plugin_name, '{PN} %s for %%s' % name, extra_depends='', hook=dev_hook) do_split_packages(d, plugin_dir_dbg, glob, plugin_name_dbg, '{PN} %s for %%s' % name, extra_depends='', hook=dbg_hook) - print meta_name, dev_packages, dbg_packages - bb.data.setVar("RDEPENDS_%s" % meta_name, " ".join(dev_packages), d) - bb.data.setVar("RDEPENDS_%s-dbg" % meta_name, " ".join(dbg_packages), d) - - qtopia_split('accessible', 'accessible', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-accessible") - qtopia_split('codecs', 'codec', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-codecs") - qtopia_split('decorations', 'decoration', '^libqdecoration(.*)\.so$', "${QT_BASE_NAME}-plugins-decorations") - qtopia_split('designer', 'designer', '^lib(.*)\.so$', "${QT_BASE_NAME}-plugins-designer") - qtopia_split('gfxdrivers', 'gfxdriver', '^libqgfx(.*)\.so$', "${QT_BASE_NAME}-plugins-gfxdrivers") - qtopia_split('mousedrivers','mousedriver', '^libq(.*)mousedriver\.so$', "${QT_BASE_NAME}-plugins-mousedrivers") - qtopia_split('iconengines', 'iconengine', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-iconengines") - qtopia_split('imageformats','imageformat', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-imageformats") - qtopia_split('inputmethods','inputmethod', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-inputmethods") - qtopia_split('sqldrivers', 'sqldriver', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-sqldrivers") - qtopia_split('styles', 'style', '^libq(.*)\.so$', "${QT_BASE_NAME}-plugins-styles") + + qtopia_split('accessible', 'accessible', '^libq(.*)\.so$') + qtopia_split('codecs', 'codec', '^libq(.*)\.so$') + qtopia_split('decorations', 'decoration', '^libqdecoration(.*)\.so$') + qtopia_split('designer', 'designer', '^lib(.*)\.so$') + qtopia_split('gfxdrivers', 'gfxdriver', '^libqgfx(.*)\.so$') + qtopia_split('mousedrivers','mousedriver', '^libq(.*)mousedriver\.so$') + qtopia_split('iconengines', 'iconengine', '^libq(.*)\.so$') + qtopia_split('imageformats','imageformat', '^libq(.*)\.so$') + qtopia_split('inputmethods','inputmethod', '^libq(.*)\.so$') + qtopia_split('sqldrivers', 'sqldriver', '^libq(.*)\.so$') + qtopia_split('styles', 'style', '^libq(.*)\.so$') } -- cgit v1.2.3 From f445e6d0f90b8bcce3cb8a95c40f7e56c821661e Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 22 Jan 2008 08:39:29 +0000 Subject: packages/qt4/qt_packaging.inc: Fix packaging of the -dbg packages split in packages.bbclass gets called after the work in do_populate_packages_prepend() is done. This means that on the first packaging attempt no .debug files exist. So create one -dbg package for every plugin we find and assume that the file is getting split out. --- packages/qt4/qt_packaging.inc | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/packages/qt4/qt_packaging.inc b/packages/qt4/qt_packaging.inc index 931c5671d9..ba2a037f59 100644 --- a/packages/qt4/qt_packaging.inc +++ b/packages/qt4/qt_packaging.inc @@ -134,22 +134,24 @@ python populate_packages_prepend() { new packages to the meta package. """ plugin_dir = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/' % path, d) - plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug/' % path, d) if not os.path.exists("%s%s" % (bb.data.expand('${D}',d), plugin_dir)): bb.note("The path does not exist:", bb.data.expand('${D}', d), plugin_dir) return - plugin_name = bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name, d) - plugin_name_dbg= bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s-dbg' % name, d) - print plugin_name, plugin_name_dbg, glob - - dev_packages = [] - dev_hook = lambda a,pkg,b,c,d:dev_packages.append(pkg) - dbg_packages = [] - dbg_hook = lambda a,pkg,b,c,d:dbg_packages.append(pkg) - do_split_packages(d, plugin_dir, glob, plugin_name, '{PN} %s for %%s' % name, extra_depends='', hook=dev_hook) - do_split_packages(d, plugin_dir_dbg, glob, plugin_name_dbg, '{PN} %s for %%s' % name, extra_depends='', hook=dbg_hook) - + plugin_name = bb.data.expand('${QT_BASE_NAME}-plugin-%s-%%s' % name, d) + dev_packages = [] + dev_hook = lambda file,pkg,b,c,d:dev_packages.append((file,pkg)) + do_split_packages(d, plugin_dir, glob, plugin_name, '{PN} %s for %%s' % name, extra_depends='', hook=dev_hook) + # Create a -dbg package as well + plugin_dir_dbg = bb.data.expand('${libdir}/${QT_DIR_NAME}/plugins/%s/.debug' % path, d) + packages = bb.data.getVar('PACKAGES',d) + for (file,package) in dev_packages: + packages = "%s %s-dbg" % (packages, package) + file_name = os.path.join(plugin_dir_dbg, os.path.basename(file)) + bb.data.setVar("FILES_%s-dbg" % package, file_name, d) + bb.data.setVar("DESCRIPTION_%s-dbg" % package, "{PN} %s for %s" % (name, package), d) + + bb.data.setVar('PACKAGES', packages, d) qtopia_split('accessible', 'accessible', '^libq(.*)\.so$') qtopia_split('codecs', 'codec', '^libq(.*)\.so$') -- cgit v1.2.3