[oe-commits] org.oe.dev merge of '627199fbe7856e67f8ca9485039c90a227b48598'
hrw commit
openembedded-commits at lists.openembedded.org
Mon Jul 2 12:28:14 UTC 2007
merge of '627199fbe7856e67f8ca9485039c90a227b48598'
and 'c26b01670f3bc8836f1ec27d0de85f3743d9d523'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: f273d173d517ba98778745b37b0f630d81deb1ee
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f273d173d517ba98778745b37b0f630d81deb1ee
Files:
1
conf/machine/include/zaurus-2.6.conf
packages/0xFFFF/0xffff-native_0.2.bb
packages/0xFFFF/0xffff_0.2.bb
classes/qmake-base.bbclass
packages/0xFFFF/0xffff-native_0.1.bb
packages/0xFFFF/0xffff.inc
packages/angstrom/angstrom-console-image.bb
packages/linux/linux-x86-2.6.20/i486-defconfig
packages/linux/linux-x86_2.6.20.bb
packages/qte/qtopia-core_4.2.0.bb
Diffs:
#
# mt diff -r627199fbe7856e67f8ca9485039c90a227b48598 -rf273d173d517ba98778745b37b0f630d81deb1ee
#
#
#
# patch "conf/machine/include/zaurus-2.6.conf"
# from [a8b44649ec95bb1e794763e0208039060bd44405]
# to [08f890e9c168eb62bf5bb23912bd916c209271ed]
#
============================================================
--- conf/machine/include/zaurus-2.6.conf a8b44649ec95bb1e794763e0208039060bd44405
+++ conf/machine/include/zaurus-2.6.conf 08f890e9c168eb62bf5bb23912bd916c209271ed
@@ -28,7 +28,7 @@ MACHINE_FEATURES = "kernel26 apm alsa pc
PCMCIA_MANAGER ?= "pcmciautils"
MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen"
-MACHINE_FEATURES_append_tosa = " usbhost usbwlanng "
+MACHINE_FEATURES_append_tosa = " usbhost wifi "
MACHINE_FEATURES_append_akita = " usbhost "
MACHINE_FEATURES_append_spitz = " usbhost ext2 "
#
# mt diff -rc26b01670f3bc8836f1ec27d0de85f3743d9d523 -rf273d173d517ba98778745b37b0f630d81deb1ee
#
#
#
# add_file "packages/0xFFFF/0xffff-native_0.2.bb"
# content [6c9e9ffc3d5527a829bca5d65361f0962b8747d3]
#
# add_file "packages/0xFFFF/0xffff_0.2.bb"
# content [44898ee6491d6cea66d31cd810c3ca8e328a6d74]
#
# patch "classes/qmake-base.bbclass"
# from [21899cea6a7a8f08dec40c2a294e92ea41fb9c6b]
# to [a489a220fe2b3f37bb01107cc1365e48bea86430]
#
# patch "packages/0xFFFF/0xffff-native_0.1.bb"
# from [6c9e9ffc3d5527a829bca5d65361f0962b8747d3]
# to [959e24359ef14785c97c6811de8c9643c2220911]
#
# patch "packages/0xFFFF/0xffff.inc"
# from [344ebf78aa0e21a7b523b411ccc5cc7941cde21a]
# to [be76a770e7eaab17fb4a4733c9c98663400a2e99]
#
# patch "packages/angstrom/angstrom-console-image.bb"
# from [832927d01702fb1785940080fd2db1a1e8239d0e]
# to [e642f25712e1191f9671d162c09fd492a85400bc]
#
# patch "packages/linux/linux-x86-2.6.20/i486-defconfig"
# from [73b5bd29772aeec231936c54de86f775aad33764]
# to [eaeef6226e5d7f2bff7c3cadede34d438f45330a]
#
# patch "packages/linux/linux-x86_2.6.20.bb"
# from [68e71f54ff0de140a60e6a3f14fccf42d92ca42d]
# to [b5692bf04a1318c480b98b9968ab4ea4446181d9]
#
# patch "packages/qte/qtopia-core_4.2.0.bb"
# from [5e0afa0d27cf862f1eeb60e223952ea6718db390]
# to [003bf319b5866af6b727725457754c7f73345f6d]
#
============================================================
--- packages/0xFFFF/0xffff-native_0.2.bb 6c9e9ffc3d5527a829bca5d65361f0962b8747d3
+++ packages/0xFFFF/0xffff-native_0.2.bb 6c9e9ffc3d5527a829bca5d65361f0962b8747d3
@@ -0,0 +1,17 @@
+require 0xffff.inc
+
+inherit native
+
+do_stage() {
+ install -m 755 0xFFFF ${STAGING_BINDIR_NATIVE}
+}
+
+do_deploy[dirs] = "${S}"
+
+do_deploy() {
+ install -m 755 0xFFFF ${DEPLOY_DIR_IMAGE}
+}
+
+addtask deploy before do_package after do_install
+
+
============================================================
--- packages/0xFFFF/0xffff_0.2.bb 44898ee6491d6cea66d31cd810c3ca8e328a6d74
+++ packages/0xFFFF/0xffff_0.2.bb 44898ee6491d6cea66d31cd810c3ca8e328a6d74
@@ -0,0 +1,6 @@
+require 0xffff.inc
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 755 0xFFFF ${D}${bindir}
+}
============================================================
--- classes/qmake-base.bbclass 21899cea6a7a8f08dec40c2a294e92ea41fb9c6b
+++ classes/qmake-base.bbclass a489a220fe2b3f37bb01107cc1365e48bea86430
@@ -13,7 +13,7 @@ export OE_QMAKE_AR="${AR}"
export OE_QMAKE_LDFLAGS="${LDFLAGS}"
export OE_QMAKE_LINK="${CCLD}"
export OE_QMAKE_AR="${AR}"
-export OE_QMAKE_STRIP="${STRIP}"
+export OE_QMAKE_STRIP="echo"
export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic"
export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc"
export OE_QMAKE_RCC="non-existant"
============================================================
--- packages/0xFFFF/0xffff-native_0.1.bb 6c9e9ffc3d5527a829bca5d65361f0962b8747d3
+++ packages/0xFFFF/0xffff-native_0.1.bb 959e24359ef14785c97c6811de8c9643c2220911
@@ -1,5 +1,7 @@ require 0xffff.inc
require 0xffff.inc
+DEPENDS = "libusb-native"
+
inherit native
do_stage() {
============================================================
--- packages/0xFFFF/0xffff.inc 344ebf78aa0e21a7b523b411ccc5cc7941cde21a
+++ packages/0xFFFF/0xffff.inc be76a770e7eaab17fb4a4733c9c98663400a2e99
@@ -5,8 +5,8 @@ S = "${WORKDIR}/0xFFFF-${PV}/src"
S = "${WORKDIR}/0xFFFF-${PV}/src"
-CFLAGS += '-DVERSION="${PV}"'
-BUILD_CFLAGS += '-DVERSION="${PV}"'
+CFLAGS += '-DVERSION="${PV}" -I.'
+BUILD_CFLAGS += '-DVERSION="${PV}" -I.'
do_compile() {
oe_runmake
============================================================
--- packages/angstrom/angstrom-console-image.bb 832927d01702fb1785940080fd2db1a1e8239d0e
+++ packages/angstrom/angstrom-console-image.bb e642f25712e1191f9671d162c09fd492a85400bc
@@ -1,6 +1,6 @@ LICENSE = "MIT"
#Angstrom bootstrap image
LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
ANGSTROM_EXTRA_INSTALL ?= ""
@@ -8,7 +8,7 @@ DEPENDS = "task-base-extended \
${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \
"
-RDEPENDS = "task-base \
+RDEPENDS = "task-base-extended \
${ANGSTROM_EXTRA_INSTALL} \
${@base_contains("MACHINE_FEATURES", "screen", "psplash-zap", "",d)} \
"
============================================================
--- packages/linux/linux-x86-2.6.20/i486-defconfig 73b5bd29772aeec231936c54de86f775aad33764
+++ packages/linux/linux-x86-2.6.20/i486-defconfig eaeef6226e5d7f2bff7c3cadede34d438f45330a
@@ -702,7 +702,7 @@ CONFIG_S2IO=m
#
# Wireless LAN (non-hamradio)
#
-# CONFIG_NET_RADIO is not set
+CONFIG_NET_RADIO=y
#
# Wan interfaces
============================================================
--- packages/linux/linux-x86_2.6.20.bb 68e71f54ff0de140a60e6a3f14fccf42d92ca42d
+++ packages/linux/linux-x86_2.6.20.bb b5692bf04a1318c480b98b9968ab4ea4446181d9
@@ -1,7 +1,7 @@ LICENSE = "GPL"
DESCRIPTION = "Linux Kernel for x86 compatible machines"
SECTION = "kernel"
LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 "
============================================================
--- packages/qte/qtopia-core_4.2.0.bb 5e0afa0d27cf862f1eeb60e223952ea6718db390
+++ packages/qte/qtopia-core_4.2.0.bb 003bf319b5866af6b727725457754c7f73345f6d
@@ -1,18 +1,17 @@ HOMEPAGE = "http://www.trolltech.com"
DESCRIPTION = "Qtopia Core (aka: Qt/Embedded)"
SECTION = "libs"
LICENSE = "GPL"
PRIORITY = "optional"
HOMEPAGE = "http://www.trolltech.com"
-DEPENDS = "glib-2.0 dbus-glib tslib"
-PR = "r1"
+DEPENDS = "glib-2.0 freetype dbus-glib tslib"
+PR = "r2"
+
SRC_URI = "ftp://ftp.trolltech.com/qt/source/qtopia-core-opensource-src-${PV}.tar.gz \
file://linux-oe-qmake.conf"
S = "${WORKDIR}/qtopia-core-opensource-src-${PV}"
-PARALLEL_MAKE = ""
-
inherit pkgconfig
# I'm not sure about the globals QTDIR and QTOPIADIR, or if they're even
@@ -33,6 +32,7 @@ export QTOPIADIR = "${S}"
# Qmake gets confused by environment variables, as it builds both HOST
# and TARGET objects. The correct compiler settings come from the mkspec
# and are set with the OE_QMAKE_ variables
+PARALLEL_MAKE = ""
EXTRA_OEMAKE = " MAKEFLAGS= "
# This stuff could also be done by inheriting qmake, but I didn't want to
@@ -48,7 +48,7 @@ export OE_QMAKE_RANLIB="${RANLIB}"
export OE_QMAKE_LINK="${CXX}"
export OE_QMAKE_AR="${AR}"
export OE_QMAKE_RANLIB="${RANLIB}"
-export OE_QMAKE_STRIP="${STRIP}"
+export OE_QMAKE_STRIP="echo"
export OE_QMAKE_RPATH="-Wl,-rpath-link,"
export OE_QMAKE_INCDIR_QT="${QTDIR}/include"
export OE_QMAKE_LIBDIR_QT="${QTDIR}/lib"
@@ -65,37 +65,10 @@ QT_CONFIG_FLAGS = "-release \
# frequently, only for testing maybe. Feel free to change and to package
# them separately.
QT_CONFIG_FLAGS = "-release \
- -no-cups -no-accessibility -no-freetype \
+ -no-cups -no-accessibility \
-nomake demos -nomake examples -nomake tools \
-qt-mouse-tslib"
-# We might want to package all the libraries separately, so you can really
-# fine-tune what to install. This is e.g. done in qt4-x11-free_4.1.2.bb.
-# What should these packages be called? I'm tempted to call them the same
-# as in qt4 version, as the API is supposed to be compatible, e.g.
-# libqtcore4 and libqtgui4. This will however conflict if you have QT and
-# Qtopia, but this is something you don't want anyway, I guess.
-# Another solution is making virtual/libqtfoo4, and DEPENDing on that one
-# and let both the PACKAGES in QT and Qtopia PROVIDE these. The packages
-# themselves could then be called libqtopiafoo4.
-# I'll postpone this discussion by not making separate Qtopia packages.
-
-# Also, I don't package the plugins and translations atm, I don't use them
-# and I don't feel like thinking about a sensible separation.
-
-# PACKAGES += "libqtopiacore4 libqtopiagui4 ..."
-# RDEPENDS_${PN} += "..."
-
-# The default included fonts are around 75MB and consist of a number of
-# FreeType-renderable fonts as well as QPF (Qtopia Prerendered Fonts).
-# As FreeType is generally slow on embedded platforms, and 75MB is
-# quite huge, we downsize the fonts dir in the do_install. I've decided
-# to include only the QPF (Helvetica and Fixed), amounting to 500KB. This
-# also results in tremendously faster application startup time.
-# You might want to package the fonts separately, or include all fonts in
-# a separate package.
-FILES_${PN} += " /usr/lib/fonts/* "
-
do_configure() {
# Install the OE build templates (something which might be done
# by inheriting qmake)
@@ -141,16 +114,84 @@ do_install() {
# These are host binaries, we should only use them in staging
rm -rf ${D}/${bindir}
rm -rf ${D}/${datadir}/mkspecs
+
+ touch ${D}/${libdir}/fonts/fontdir
- # Downsize on the fonts, we're only packaging the Helvetica and
- # Fixed, only the QPF versions. Maybe later add an additional
- # package for all fonts.
- rm -f ${D}/${libdir}/fonts/*
- cp -a ${S}/lib/fonts/helvetica*qpf ${D}/${libdir}/fonts
- cp -a ${S}/lib/fonts/fixed*qpf ${D}/${libdir}/fonts
- touch ${D}/${libdir}/fonts/fontdir
+ #TT is still new to pkgconfig, so fix it up
+ install -d ${D}${libdir}/pkgconfig
+ mv ${D}/${libdir}/*.pc ${D}${libdir}/pkgconfig/
}
+# We might want to package all the libraries separately, so you can really
+# fine-tune what to install. This is e.g. done in qt4-x11-free_4.1.2.bb.
+# What should these packages be called? I'm tempted to call them the same
+# as in qt4 version, as the API is supposed to be compatible, e.g.
+# libqtcore4 and libqtgui4. This will however conflict if you have QT and
+# Qtopia, but this is something you don't want anyway, I guess.
+# Another solution is making virtual/libqtfoo4, and DEPENDing on that one
+# and let both the PACKAGES in QT and Qtopia PROVIDE these. The packages
+# themselves could then be called libqtopiafoo4.
+# I'll postpone this discussion by not making separate Qtopia packages.
+
+# Also, I don't package the plugins and translations atm, I don't use them
+# and I don't feel like thinking about a sensible separation.
+
+PACKAGES =+ " libqtcore libqtcore-dev libqtcore-dbg \
+ libqtxml libqtxml-dev libqtxml-dbg \
+ libqtgui libqtgui-dev libqtgui-dbg \
+ libqtsql libqtsql-dev libqtsql-dbg \
+ libqtnetwork libqtnetwork-dev libqtnetwork-dbg \
+ libqtsvg libqtsvg-dev libqtsvg-dbg \
+ libqt3support libqt3support-dev libqt3support-dbg \
+ qtopia-core-plugins qtopia-core-plugins-dbg\
+ "
+
+PACKAGES += " ${PN}-fonts "
+
+# The default included fonts are around 75MB and consist of a number of
+# FreeType-renderable fonts as well as QPF (Qtopia Prerendered Fonts).
+# As FreeType is generally slow on embedded platforms, and 75MB is
+# quite huge, we downsize the fonts dir in the do_install. I've decided
+# to include only the QPF (Helvetica and Fixed), amounting to 500KB. This
+# also results in tremendously faster application startup time.
+FILES_libqtcore += " ${libdir}/fonts/helvetic* ${libdir}/fonts/fixed* ${D}/${libdir}/fonts/fontdir"
+FILES_${PN}-fonts = "${libdir}/fonts"
+
+FILES_qtopia-core-plugins += "${datadir}/qtopia/plugins/*/*.so"
+FILES_qtopia-core-plugins-dbg += "${datadir}/qtopia/plugins/*/.debug/*.so"
+
+FILES_libqtcore += "${libdir}/libQtCore.so.*"
+FILES_libqtxml += "${libdir}/libQtXml.so.*"
+FILES_libqtgui += "${libdir}/libQtGui.so.*"
+FILES_libqtsql += "${libdir}/libQtSql.so.*"
+FILES_libqtnetwork += "${libdir}/libQtNetwork.so.*"
+FILES_libqtsvg += "${libdir}/libQtSvg.so.*"
+FILES_libqt3support += "${libdir}/libQt3Support.so.*"
+
+FILES_libqtcore-dev += "${libdir}/*QtCore.*"
+FILES_libqtxml-dev += "${libdir}/*QtXml.*"
+FILES_libqtgui-dev += "${libdir}/*QtGui.*"
+FILES_libqtsql-dev += "${libdir}/*QtSql.*"
+FILES_libqtnetwork-dev += "${libdir}/*QtNetwork.*"
+FILES_libqtsvg-dev += "${libdir}/*QtSvg.*"
+FILES_libqt3support-dev += "${libdir}/*Qt3Support.*"
+
+FILES_libqtcore-dbg += "${libdir}/.debug/libQtCore*"
+FILES_libqtxml-dbg += "${libdir}/.debug/libQtXml*"
+FILES_libqtgui-dbg += "${libdir}/.debug/libQtGui*"
+FILES_libqtsql-dbg += "${libdir}/.debug/libQtSql*"
+FILES_libqtnetwork-dbg += "${libdir}/.debug/libQtNetwork*"
+FILES_libqtsvg-dbg += "${libdir}/.debug/libQtSvg*"
+FILES_libqt3support-dbg += "${libdir}/.debug/libQt3Support*"
+
+
+python populate_packages_prepend() {
+ translationdir = bb.data.expand('${datadir}/qtopia/translations/', d)
+ do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' )
+}
+
+
+
STAGE_TEMP = "${WORKDIR}/temp-staging"
do_stage() {
rm -rf ${STAGE_TEMP}
More information about the Openembedded-commits
mailing list