[oe-commits] org.oe.dev merge of '05ddfe24471c42c447a6996f4ee8a09bbd402e23'
rpurdie commit
openembedded-commits at lists.openembedded.org
Tue Jan 22 09:28:52 UTC 2008
merge of '05ddfe24471c42c447a6996f4ee8a09bbd402e23'
and 'ee28a8fbd4b4c0cc97fe47467c837fb525ecdf82'
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: d5d136e1fa1dee0c172fc29b3146020feb4ae8f5
ViewMTN: http://monotone.openembedded.org/revision/info/d5d136e1fa1dee0c172fc29b3146020feb4ae8f5
Files:
1
packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb
packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb
packages/meta/external-toolchain.bb
packages/qt4/qt_packaging.inc
packages/tasks/task-openmoko-toolchain-host.bb
packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie
packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb
Diffs:
#
# mt diff -r05ddfe24471c42c447a6996f4ee8a09bbd402e23 -rd5d136e1fa1dee0c172fc29b3146020feb4ae8f5
#
#
#
# delete "packages/linux/linux-openmoko-devel_svn+2.6.23.1.bb"
#
# delete "packages/linux/linux-openmoko-devel_svn+2.6.24-rc6.bb"
#
# patch "packages/meta/external-toolchain.bb"
# from [dcaf40be62789b278a8bcf32b7d1a80010487c6a]
# to [8a4aa638876b87a86af07f785abb89bf79bf0378]
#
# patch "packages/qt4/qt_packaging.inc"
# from [b7908307df304cf7663fbeed5aa0765694bc334f]
# to [10c4b21735e8cff175978c971577e1cac4681cad]
#
# patch "packages/tasks/task-openmoko-toolchain-host.bb"
# from [b9a3d69c6fddd5412b4d45ac8d8190ff8c06fc9c]
# to [18d598d5b825df34b71ca3782f11a025f482fd94]
#
============================================================
--- packages/meta/external-toolchain.bb dcaf40be62789b278a8bcf32b7d1a80010487c6a
+++ packages/meta/external-toolchain.bb 8a4aa638876b87a86af07f785abb89bf79bf0378
@@ -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"
============================================================
--- packages/qt4/qt_packaging.inc b7908307df304cf7663fbeed5aa0765694bc334f
+++ packages/qt4/qt_packaging.inc 10c4b21735e8cff175978c971577e1cac4681cad
@@ -8,13 +8,6 @@ NONDEV_PACKAGES += "${QT_BASE_LIB}core4
${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-designer \
- ${QT_BASE_NAME}-plugins-imageformats \
- ${QT_BASE_NAME}-plugins-sqldrivers \
- ${QT_BASE_NAME}-plugins-inputmethods \
- ${QT_BASE_NAME}-plugins-iconengines \
${QT_BASE_NAME}-fonts "
DEV_PACKAGES += "${QT_BASE_LIB}core4-dev \
@@ -46,7 +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_LIB}opengl4-dbg"
PACKAGES += "${DEV_PACKAGES} ${NONDEV_PACKAGES} ${DBG_PACKAGES}"
@@ -54,7 +47,7 @@ FILES_${PN}-dev = " ${includedir}/${QT_D
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}"
@@ -112,14 +105,6 @@ FILES_${QT_BASE_LIB}uitools4-dev
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"
-
FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant*"
FILES_${QT_BASE_NAME}-designer = "${bindir}/*designer*"
FILES_${QT_BASE_NAME}-linguist = "${bindir}/*linguist* ${bindir}/lrelease ${bindir}/lupdate ${bindir}/qm2ts"
@@ -133,8 +118,52 @@ python populate_packages_prepend() {
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_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_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):
+ """
+ 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)
+ 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)
+ 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$')
+ 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$')
}
============================================================
--- packages/tasks/task-openmoko-toolchain-host.bb b9a3d69c6fddd5412b4d45ac8d8190ff8c06fc9c
+++ packages/tasks/task-openmoko-toolchain-host.bb 18d598d5b825df34b71ca3782f11a025f482fd94
@@ -11,16 +11,3 @@ RDEPENDS_${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 \
-"
#
# mt diff -ree28a8fbd4b4c0cc97fe47467c837fb525ecdf82 -rd5d136e1fa1dee0c172fc29b3146020feb4ae8f5
#
#
#
# patch "packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie"
# from [c4ddf6f7a69b40a2cc6aec21cd1f07f72af013dd]
# to [c9da3bd7bc66685ea2b3e52ada4b3b1ea3d3353f]
#
# patch "packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb"
# from [91c8f73922532616261250e9409b344de817d50d]
# to [6eabfddf3cf9eab10a398a56f6f2e7c58059c837]
#
============================================================
--- packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie c4ddf6f7a69b40a2cc6aec21cd1f07f72af013dd
+++ packages/linux/linux-rp-2.6.23+2.6.24-rc8/defconfig-collie c9da3bd7bc66685ea2b3e52ada4b3b1ea3d3353f
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.24-rc8
-# Sun Jan 20 18:52:49 2008
+# Mon Jan 21 21:35:18 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1279,9 +1279,9 @@ CONFIG_MSDOS_PARTITION=y
# CONFIG_KARMA_PARTITION is not set
# CONFIG_EFI_PARTITION is not set
# CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=y
+CONFIG_NLS=m
CONFIG_NLS_DEFAULT="cp437"
-CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_437=m
CONFIG_NLS_CODEPAGE_737=m
CONFIG_NLS_CODEPAGE_775=m
CONFIG_NLS_CODEPAGE_850=m
@@ -1305,7 +1305,7 @@ CONFIG_NLS_ASCII=m
CONFIG_NLS_CODEPAGE_1250=m
CONFIG_NLS_CODEPAGE_1251=m
CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_1=m
CONFIG_NLS_ISO8859_2=m
CONFIG_NLS_ISO8859_3=m
CONFIG_NLS_ISO8859_4=m
============================================================
--- packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb 91c8f73922532616261250e9409b344de817d50d
+++ packages/linux/linux-rp_2.6.23+2.6.24-rc8.bb 6eabfddf3cf9eab10a398a56f6f2e7c58059c837
@@ -1,6 +1,6 @@ require linux-rp.inc
require linux-rp.inc
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_collie = "1"
More information about the Openembedded-commits
mailing list