From 9a4113fa26927867f33b35579de32f72b0728218 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Mon, 17 Mar 2008 16:00:48 +0000 Subject: Add my tools to forward the Serial from the Neo to my PC and provide a PTY on the PC --- packages/openmoko-tools/pty-forward-native.bb | 24 ++++++++++++++++++++++++ packages/openmoko-tools/serial-forward.bb | 15 +++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 packages/openmoko-tools/pty-forward-native.bb create mode 100644 packages/openmoko-tools/serial-forward.bb (limited to 'packages') diff --git a/packages/openmoko-tools/pty-forward-native.bb b/packages/openmoko-tools/pty-forward-native.bb new file mode 100644 index 0000000000..972070d6b6 --- /dev/null +++ b/packages/openmoko-tools/pty-forward-native.bb @@ -0,0 +1,24 @@ +LICENSE="GPL" +SUMMARY="Receive a forwarded serial from serial-forward and provide a PTY" + +SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http" +S = "${WORKDIR}/serial_forward" + +inherit native + +do_compile() { + cd ${S} + oe_runmake +} + +do_stage() { + : +} + +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0755 ${S}/pty_forward ${DEPLOY_DIR_IMAGE}/pty-forward +} + +addtask deploy before do_package after do_install + diff --git a/packages/openmoko-tools/serial-forward.bb b/packages/openmoko-tools/serial-forward.bb new file mode 100644 index 0000000000..3cc33770d6 --- /dev/null +++ b/packages/openmoko-tools/serial-forward.bb @@ -0,0 +1,15 @@ +LICENSE="GPL" +SUMMARY="Forward a serial using TCP/IP" + +SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=serial_forward;proto=http" +S="${WORKDIR}/serial_forward" + +do_compile() { + cd ${S} + oe_runmake +} + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${S}/forward ${D}/${bindir}/${PN} +} -- cgit v1.2.3 From a39447305a6bfec0b4fd057f495cf253e31bb61a Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 18 Mar 2008 12:05:39 +0000 Subject: Next attempt to get a non segfaulting qpe/Qtopia. -edition phone might be the key but this should be set by .configureoptions.. --- .../qtopia-phone-x11/fic-gta02/device-conf | 47 +++++----------------- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 12 +----- 2 files changed, 13 insertions(+), 46 deletions(-) (limited to 'packages') diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf index 7c8a59ff29..0ec27eb773 100644 --- a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf +++ b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf @@ -1,45 +1,20 @@ --arch OE_QT_ARCH +-arch arm -xplatform OE_QT_XPLATFORM --verbose --qtopiamedia --no-infrared +-little-endian +-edition phone -dbus --dbuspath OE_QT_DBUSPATH --iconsize 22 -displaysize 480x640 --extra-qtopiacore-config "-fast" --extra-qtopiacore-config "-no-accessibility" --extra-qtopiacore-config "-no-cups" --extra-qtopiacore-config "-no-iconv" --extra-qtopiacore-config "-nomake demos" --extra-qtopiacore-config "-nomake examples" --extra-qtopiacore-config "-qt-libjpeg" --extra-qtopiacore-config "-qt-libmng" --extra-qtopiacore-config "-qt-libpng" --extra-qtopiacore-config "-qt-zlib" --extra-qtopiacore-config "-release" --extra-qtopiacore-config "-no-sm" --extra-qtopiacore-config "-fontconfig" --extra-qtopiacore-config "-xrandr" --extra-qtopiacore-config "-xrender" --extra-qtopiacore-config "OE_QT_ENDIAN" --extra-qt-config "-nomake examples" --extra-qt-config "-nomake demos" --extra-qt-config "-no-sm" --extra-qtopiacore-config "OE_QT_ENDIAN" --font dejavu_sans_condensed:10,11,13,15,16,17,18,19,28,36:50,75 --image OE_QT_RPREFIX --launch-method quicklaunch --force-quicklaunch --no-clean +-voip +-sound-system alsa +-bluetooth -no-drm --no-qvfb --no-vpn -no-sxe --no-silent +-no-infrared +-extra-qtopiacore-config "-no-cups -no-iconv -no-sm -fontconfig -xrender -xrandr" +-extra-qt-config "-nomake examples -nomake demos -no-sm" +-image OE_QT_RPREFIX +-launch-method normal -prefix OE_QT_RPREFIX --reduce-exports=yes -release -confirm-license -OE_QT_EXTRACONFIG diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index 3a08e86d66..6f2f2023d9 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -12,7 +12,7 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" PROVIDES = "qtopia-phone" -PR = "r4" +PR = "r6" SRCREV = "${AUTOREV}" SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \ file://device-conf \ @@ -35,18 +35,13 @@ export QTOPIA_DEPOT_PATH = "${S}" require qtopia-phone_arch.inc -QT_ARCH = "${@qtopia_arch(d)}" -QT_ENDIAN = "${@qtopia_endian(d)}" PLATFORM = "${BUILD_OS}-g++" XPLATFORM = "linux-oe-g++" BUILDDIR = "${WORKDIR}/build" OE_QT_DBUSPATH = "${STAGING_DIR_HOST}" -OE_QT_ARCH = "${QT_ARCH}" OE_QT_XPLATFORM = "${XPLATFORM}" OE_QT_RPREFIX = "/opt/Qtopia" -OE_QT_ENDIAN = "${QT_ENDIAN}" -OE_QT_EXTRACONFIG = "-I${STAGING_INCDIR}/dbus-1.0" do_configure() { @@ -66,11 +61,8 @@ sed -i -e "s|QMAKE_RPATH.*|QMAKE_RPATH =|" ${S}/devices/${TARGET-DEVICE}/mkspecs # sed the dynamic config into the file sed -i -e "s|OE_QT_DBUSPATH|${OE_QT_DBUSPATH}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_ARCH|${OE_QT_ARCH}|" ${WORKDIR}/device-conf sed -i -e "s|OE_QT_XPLATFORM|${OE_QT_XPLATFORM}|" ${WORKDIR}/device-conf sed -i -e "s|OE_QT_RPREFIX|${OE_QT_RPREFIX}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_ENDIAN|${OE_QT_ENDIAN}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_EXTRACONFIG|${OE_QT_EXTRACONFIG}|" ${WORKDIR}/device-conf rm -f ${S}/devices/${TARGET-DEVICE}/configure cp ${WORKDIR}/device-conf ${S}/devices/${TARGET-DEVICE}/configure @@ -79,7 +71,7 @@ echo "" > ${S}/devices/${TARGET-DEVICE}/environment mkdir -p ${BUILDDIR} cd ${BUILDDIR} -echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/fontconfig +echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/fontconfig -I${STAGING_INCDIR}/dbus-1.0 } -- cgit v1.2.3 From 2c8b4228ac297fb42b71608fd1419a9d79b24135 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 18 Mar 2008 12:11:49 +0000 Subject: Qtopia/X11: Use the muxer and phone vendor for the TI calypso module --- packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages') diff --git a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia index 88be2061dc..a85e9aa5fe 100644 --- a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia +++ b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia @@ -28,6 +28,8 @@ export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH #tell Qtopia how to inform illume on incoming phone calls #export ILLUME_PHONE_CALL= +export QTOPIA_PHONE_VENDOR=ficgta01 +export QTOPIA_PHONE_MUX=ficgta01 # Now start Qtopia -- cgit v1.2.3 From 8bd23683ad73c1ec1a677fa3dba0172de94f432a Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 18 Mar 2008 18:42:51 +0000 Subject: Qtopia/X11: Rework configuration, compilation of Qtopia with the hope to make the segfaults go away --- .../qtopia-phone-x11/Xsession.d/.mtn2git_empty | 0 .../qtopia-phone-x11/Xsession.d/99qtopia | 36 ----- .../fic-gta02/Xsession.d/.mtn2git_empty | 0 .../qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia | 36 +++++ .../qtopia-phone-x11/fic-gta02/device-conf | 20 --- .../qtopia-phone-x11/fic-gta02/qplatformdefs.h | 146 --------------------- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 71 +++++----- 7 files changed, 72 insertions(+), 237 deletions(-) delete mode 100644 packages/qtopia-phone/qtopia-phone-x11/Xsession.d/.mtn2git_empty delete mode 100644 packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia create mode 100644 packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/.mtn2git_empty create mode 100644 packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia delete mode 100644 packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf delete mode 100644 packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h (limited to 'packages') diff --git a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/.mtn2git_empty b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia b/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia deleted file mode 100644 index a85e9aa5fe..0000000000 --- a/packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -# xmodmap to allow the soft-menu to work -xmodmap -e "keycode 180 = 0x11000601" -xmodmap -e "keycode 181 = 0x11000602" -xmodmap -e "keycode 182 = 0x11000603" -xmodmap -e "keycode 183 = 0x11000604" -xmodmap -e "keycode 184 = 0x11000605" -xmodmap -e "keycode 185 = 0x11000606" -xmodmap -e "keycode 186 = 0x11000607" -xmodmap -e "keycode 187 = 0x11000608" -xmodmap -e "keycode 188 = 0x11000609" -xmodmap -e "keycode 189 = 0x1100060A" -xmodmap -e "keycode 190 = 0x1100060B" -xmodmap -e "keycode 191 = 0x1100060B" -xmodmap -e "keycode 192 = 0x1100060A" -xmodmap -e "keycode 193 = 0x1100060C" -xmodmap -e "keycode 194 = 0x1100060D" -xmodmap -e "keycode 195 = 0x1100060E" -xmodmap -e "keycode 196 = 0x1100060F" -xmodmap -e "keycode 197 = 0x11000610" -xmodmap -e "keycode 198 = 0x1008ff26" - -# path setup -export QPEDIR=/opt/Qtopia -export PATH=$QPEDIR/bin:$PATH -export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH - -#tell Qtopia how to inform illume on incoming phone calls -#export ILLUME_PHONE_CALL= -export QTOPIA_PHONE_VENDOR=ficgta01 -export QTOPIA_PHONE_MUX=ficgta01 - - -# Now start Qtopia -exec qpe diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/.mtn2git_empty b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia new file mode 100644 index 0000000000..a85e9aa5fe --- /dev/null +++ b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia @@ -0,0 +1,36 @@ +#!/bin/sh + +# xmodmap to allow the soft-menu to work +xmodmap -e "keycode 180 = 0x11000601" +xmodmap -e "keycode 181 = 0x11000602" +xmodmap -e "keycode 182 = 0x11000603" +xmodmap -e "keycode 183 = 0x11000604" +xmodmap -e "keycode 184 = 0x11000605" +xmodmap -e "keycode 185 = 0x11000606" +xmodmap -e "keycode 186 = 0x11000607" +xmodmap -e "keycode 187 = 0x11000608" +xmodmap -e "keycode 188 = 0x11000609" +xmodmap -e "keycode 189 = 0x1100060A" +xmodmap -e "keycode 190 = 0x1100060B" +xmodmap -e "keycode 191 = 0x1100060B" +xmodmap -e "keycode 192 = 0x1100060A" +xmodmap -e "keycode 193 = 0x1100060C" +xmodmap -e "keycode 194 = 0x1100060D" +xmodmap -e "keycode 195 = 0x1100060E" +xmodmap -e "keycode 196 = 0x1100060F" +xmodmap -e "keycode 197 = 0x11000610" +xmodmap -e "keycode 198 = 0x1008ff26" + +# path setup +export QPEDIR=/opt/Qtopia +export PATH=$QPEDIR/bin:$PATH +export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH + +#tell Qtopia how to inform illume on incoming phone calls +#export ILLUME_PHONE_CALL= +export QTOPIA_PHONE_VENDOR=ficgta01 +export QTOPIA_PHONE_MUX=ficgta01 + + +# Now start Qtopia +exec qpe diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf deleted file mode 100644 index 0ec27eb773..0000000000 --- a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf +++ /dev/null @@ -1,20 +0,0 @@ --arch arm --xplatform OE_QT_XPLATFORM --little-endian --edition phone --dbus --displaysize 480x640 --voip --sound-system alsa --bluetooth --no-drm --no-sxe --no-infrared --extra-qtopiacore-config "-no-cups -no-iconv -no-sm -fontconfig -xrender -xrandr" --extra-qt-config "-nomake examples -nomake demos -no-sm" --image OE_QT_RPREFIX --launch-method normal --prefix OE_QT_RPREFIX --release --confirm-license - diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h deleted file mode 100644 index c216578d97..0000000000 --- a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h +++ /dev/null @@ -1,146 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2000-2007 TROLLTECH ASA. All rights reserved. -** -** This file is part of the Opensource Edition of the Qtopia Toolkit. -** -** This software is licensed under the terms of the GNU General Public -** License (GPL) version 2. -** -** See http://www.trolltech.com/gpl/ for GPL licensing information. -** -** Contact info@trolltech.com if any conditions of this licensing are -** not clear to you. -** -** -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ - -#ifndef QPLATFORMDEFS_H -#define QPLATFORMDEFS_H - -// Get Qt defines/settings - -#include "qglobal.h" - -// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs - -// 1) need to reset default environment if _BSD_SOURCE is defined -// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0 -// 3) it seems older glibc need this to include the X/Open stuff -#ifndef _GNU_SOURCE -# define _GNU_SOURCE -#endif - -#include - - -// We are hot - unistd.h should have turned on the specific APIs we requested - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifndef QT_NO_IPV6IFNAME -#include -#endif - -#ifdef QT_LARGEFILE_SUPPORT -#define QT_STATBUF struct stat64 -#define QT_STATBUF4TSTAT struct stat64 -#define QT_STAT ::stat64 -#define QT_FSTAT ::fstat64 -#define QT_LSTAT ::lstat64 -#define QT_OPEN ::open64 -#define QT_TRUNCATE ::truncate64 -#define QT_FTRUNCATE ::ftruncate64 -#define QT_LSEEK ::lseek64 -#else -#define QT_STATBUF struct stat -#define QT_STATBUF4TSTAT struct stat -#define QT_STAT ::stat -#define QT_FSTAT ::fstat -#define QT_LSTAT ::lstat -#define QT_OPEN ::open -#define QT_TRUNCATE ::truncate -#define QT_FTRUNCATE ::ftruncate -#define QT_LSEEK ::lseek -#endif - -#ifdef QT_LARGEFILE_SUPPORT -#define QT_FOPEN ::fopen64 -#define QT_FSEEK ::fseeko64 -#define QT_FTELL ::ftello64 -#define QT_FGETPOS ::fgetpos64 -#define QT_FSETPOS ::fsetpos64 -#define QT_FPOS_T fpos64_t -#define QT_OFF_T off64_t -#else -#define QT_FOPEN ::fopen -#define QT_FSEEK ::fseek -#define QT_FTELL ::ftell -#define QT_FGETPOS ::fgetpos -#define QT_FSETPOS ::fsetpos -#define QT_FPOS_T fpos_t -#define QT_OFF_T long -#endif - -#define QT_STAT_REG S_IFREG -#define QT_STAT_DIR S_IFDIR -#define QT_STAT_MASK S_IFMT -#define QT_STAT_LNK S_IFLNK -#define QT_SOCKET_CONNECT ::connect -#define QT_SOCKET_BIND ::bind -#define QT_SOCKET_BIND ::bind -#define QT_FILENO fileno -#define QT_CLOSE ::close -#define QT_READ ::read -#define QT_WRITE ::write -#define QT_ACCESS ::access -#define QT_GETCWD ::getcwd -#define QT_CHDIR ::chdir -#define QT_MKDIR ::mkdir -#define QT_RMDIR ::rmdir -#define QT_OPEN_LARGEFILE O_LARGEFILE -#define QT_OPEN_RDONLY O_RDONLY -#define QT_OPEN_WRONLY O_WRONLY -#define QT_OPEN_RDWR O_RDWR -#define QT_OPEN_CREAT O_CREAT -#define QT_OPEN_TRUNC O_TRUNC -#define QT_OPEN_APPEND O_APPEND - -#define QT_SIGNAL_RETTYPE void -#define QT_SIGNAL_ARGS int -#define QT_SIGNAL_IGNORE SIG_IGN - -#if defined(__GLIBC__) && (__GLIBC__ >= 2) -#define QT_SOCKLEN_T socklen_t -#else -#define QT_SOCKLEN_T int -#endif - -#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf -#endif - -#define QT_QLOCALE_USES_FCVT - -#endif // QPLATFORMDEFS_H diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index 6f2f2023d9..a7a1a2df85 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -12,11 +12,9 @@ PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" PROVIDES = "qtopia-phone" -PR = "r6" +PR = "r7" SRCREV = "${AUTOREV}" SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \ - file://device-conf \ - file://qplatformdefs.h \ file://Xsession.d/99qtopia \ file://qtopia.sh" @@ -31,47 +29,47 @@ TARGET-DEVICE="${@base_contains('MACHINE', 'tosa', ' c3200', '',d)}" TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta01', 'ficgta01', '',d)}" TARGET-DEVICE="${@base_contains('MACHINE', 'fic-gta02', 'ficgta01', '',d)}" -export QTOPIA_DEPOT_PATH = "${S}" - require qtopia-phone_arch.inc +QT_ARCH = "${@qtopia_arch(d)}" +QT_ENDIAN = "${@qtopia_endian(d)}" PLATFORM = "${BUILD_OS}-g++" -XPLATFORM = "linux-oe-g++" BUILDDIR = "${WORKDIR}/build" +OE_QT_PREFIX = "/opt/Qtopia" -OE_QT_DBUSPATH = "${STAGING_DIR_HOST}" -OE_QT_XPLATFORM = "${XPLATFORM}" -OE_QT_RPREFIX = "/opt/Qtopia" +export OE_QMAKE_CC="${CC}" +export OE_QMAKE_CFLAGS="${CFLAGS}" +export OE_QMAKE_CXX="${CXX}" +export OE_QMAKE_LDFLAGS="${LDFLAGS}" +export OE_QMAKE_AR="${AR}" +export OE_QMAKE_STRIP="echo" +export OE_QMAKE_RPATH="-Wl,-rpath-link," do_configure() { +# This qmake some how does not honor env var, let us fix it by sed force +sed -i s%$\(OE_QMAKE_CC\)%"${CC}"%g ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf +sed -i s%$\(OE_QMAKE_CFLAGS\)%"${CFLAGS}"%g ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf +sed -i s%$\(OE_QMAKE_CXX\)%"${CXX}"%g ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf +sed -i s%$\(OE_QMAKE_CXXFLAGS\)%"${CXXFLAGS}"%g ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf +sed -i s%$\(OE_QMAKE_LINK\)%"${CXX}"%g ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf +sed -i s%$\(OE_QMAKE_LDFLAGS\)%"${LDFLAGS}"%g ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf +sed -i s%$\(OE_QMAKE_AR\)%"${AR}"%g ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf +sed -i s%$\(OE_QMAKE_STRIP\)%"echo"%g ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/linux-oe-g++/qmake.conf + + unset CC unset CXX unset CFLAGS unset CXXFLAGS unset LDFLAGS -mkdir -p ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} -install -m 644 ${S}/qtopiacore/qt/mkspecs/qws/linux-arm-g++/qmake.conf \ - ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} -install -m 644 ${WORKDIR}/qplatformdefs.h \ - ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM} -sed -i -e "s@arm-linux-@${TARGET_SYS}-@" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf -sed -i -e "s|QMAKE_RPATH.*|QMAKE_RPATH =|" ${S}/devices/${TARGET-DEVICE}/mkspecs/qws/${XPLATFORM}/qmake.conf - -# sed the dynamic config into the file -sed -i -e "s|OE_QT_DBUSPATH|${OE_QT_DBUSPATH}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_XPLATFORM|${OE_QT_XPLATFORM}|" ${WORKDIR}/device-conf -sed -i -e "s|OE_QT_RPREFIX|${OE_QT_RPREFIX}|" ${WORKDIR}/device-conf - -rm -f ${S}/devices/${TARGET-DEVICE}/configure -cp ${WORKDIR}/device-conf ${S}/devices/${TARGET-DEVICE}/configure -rm -f ${S}/devices/${TARGET-DEVICE}/environment -echo "" > ${S}/devices/${TARGET-DEVICE}/environment mkdir -p ${BUILDDIR} cd ${BUILDDIR} -echo yes | ${S}/configure -device ${TARGET-DEVICE} -xplatform ${XPLATFORM} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/fontconfig -I${STAGING_INCDIR}/dbus-1.0 +echo yes | ${S}/configure -xplatform linux-oe-g++ -arch ${QT_ARCH} ${QT_ENDIAN} -prefix ${OE_QT_PREFIX} -device ${TARGET-DEVICE} -verbose \ + -no-drm -no-sxe -displaysize 480x640 -dbus -debug -extra-qtopiacore-config "-qt-libjpeg -qt-zlib -qt-libpng -no-iconv -no-sm -fontconfig -xrender -xrandr" \ + -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/fontconfig -I${STAGING_INCDIR}/dbus-1.0 } @@ -86,7 +84,7 @@ do_stage() { do_install() { cd ${BUILDDIR} - oe_runmake install INSTALL_ROOT=${D}${OE_QT_RPREFIX} IMAGE=${D}${OE_QT_RPREFIX} + oe_runmake install INSTALL_ROOT=${D}${OE_QT_PREFIX} IMAGE=${D}${OE_QT_PREFIX} # Install freedesktop.org .desktop files for enlightenment install -d ${D}${datadir}/applications @@ -110,12 +108,15 @@ do_install() { install -m 0755 ${WORKDIR}/qtopia.sh ${D}${sysconfdir}/profile.d/ } -FILES_${PN} += "${OE_QT_RPREFIX}/bin ${OE_QT_RPREFIX}/help \ - ${OE_QT_RPREFIX}/lib/*.so.* ${OE_QT_RPREFIX}/plugins \ - ${OE_QT_RPREFIX}/qtopia_db.sqlite ${OE_QT_RPREFIX}/sounds \ - ${OE_QT_RPREFIX}/etc ${OE_QT_RPREFIX}/i18n \ - ${OE_QT_RPREFIX}/pics ${OE_QT_RPREFIX}/qt_plugins \ - ${OE_QT_RPREFIX}/services ${OE_QT_RPREFIX}/lib/fonts" +FILES_${PN} += "${OE_QT_PREFIX}/bin ${OE_QT_PREFIX}/help \ + ${OE_QT_PREFIX}/lib/*.so.* ${OE_QT_PREFIX}/plugins/*/*.so \ + ${OE_QT_PREFIX}/qtopia_db.sqlite ${OE_QT_PREFIX}/sounds \ + ${OE_QT_PREFIX}/etc ${OE_QT_PREFIX}/i18n \ + ${OE_QT_PREFIX}/pics ${OE_QT_PREFIX}/qt_plugins/*/*.so \ + ${OE_QT_PREFIX}/services" + +FILES_${PN}-dbg += "${OE_QT_PREFIX}/lib/.debug/ ${OE_QT_PREFIX}/bin/.debug/ \ + ${OE_QT_PREFIX}/plugins/*/.debug/ ${OE_QT_PREFIX}/qt_plugins/*/.debug/ " -FILES_${PN}-dev += "${OE_QT_RPREFIX}/lib/*.so" +FILES_${PN}-dev += "${OE_QT_PREFIX}/lib/*.so" -- cgit v1.2.3 From ac20f2d109f72d8e5f05815398bb98830e0f3291 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 18 Mar 2008 20:18:39 +0000 Subject: Qtopia/X11: The alarm handling of Qtopia needs atd around to make sure we wake up --- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 1 + 1 file changed, 1 insertion(+) (limited to 'packages') diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index a7a1a2df85..2eea6933a1 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -11,6 +11,7 @@ LICENSE = "GPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" +RDEPENDS = "atd" PROVIDES = "qtopia-phone" PR = "r7" SRCREV = "${AUTOREV}" -- cgit v1.2.3 From 36f7974ce2ee764858a3ed74638e2ae1524a24fe Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 18 Mar 2008 20:37:12 +0000 Subject: Qtopia/X11: Make sure we get started before the window manager. No idea if the xmodmap settings will persist --- .../qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia | 36 ++++++++++++++++++++++ .../qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia | 36 ---------------------- 2 files changed, 36 insertions(+), 36 deletions(-) create mode 100644 packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia delete mode 100644 packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia (limited to 'packages') diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia new file mode 100644 index 0000000000..c987e2618d --- /dev/null +++ b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia @@ -0,0 +1,36 @@ +#!/bin/sh + +# xmodmap to allow the soft-menu to work +xmodmap -e "keycode 180 = 0x11000601" +xmodmap -e "keycode 181 = 0x11000602" +xmodmap -e "keycode 182 = 0x11000603" +xmodmap -e "keycode 183 = 0x11000604" +xmodmap -e "keycode 184 = 0x11000605" +xmodmap -e "keycode 185 = 0x11000606" +xmodmap -e "keycode 186 = 0x11000607" +xmodmap -e "keycode 187 = 0x11000608" +xmodmap -e "keycode 188 = 0x11000609" +xmodmap -e "keycode 189 = 0x1100060A" +xmodmap -e "keycode 190 = 0x1100060B" +xmodmap -e "keycode 191 = 0x1100060B" +xmodmap -e "keycode 192 = 0x1100060A" +xmodmap -e "keycode 193 = 0x1100060C" +xmodmap -e "keycode 194 = 0x1100060D" +xmodmap -e "keycode 195 = 0x1100060E" +xmodmap -e "keycode 196 = 0x1100060F" +xmodmap -e "keycode 197 = 0x11000610" +xmodmap -e "keycode 198 = 0x1008ff26" + +# path setup +export QPEDIR=/opt/Qtopia +export PATH=$QPEDIR/bin:$PATH +export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH + +#tell Qtopia how to inform illume on incoming phone calls +#export ILLUME_PHONE_CALL= +export QTOPIA_PHONE_VENDOR=ficgta01 +export QTOPIA_PHONE_MUX=ficgta01 + + +# Now start Qtopia +qpe & diff --git a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia b/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia deleted file mode 100644 index a85e9aa5fe..0000000000 --- a/packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/99qtopia +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -# xmodmap to allow the soft-menu to work -xmodmap -e "keycode 180 = 0x11000601" -xmodmap -e "keycode 181 = 0x11000602" -xmodmap -e "keycode 182 = 0x11000603" -xmodmap -e "keycode 183 = 0x11000604" -xmodmap -e "keycode 184 = 0x11000605" -xmodmap -e "keycode 185 = 0x11000606" -xmodmap -e "keycode 186 = 0x11000607" -xmodmap -e "keycode 187 = 0x11000608" -xmodmap -e "keycode 188 = 0x11000609" -xmodmap -e "keycode 189 = 0x1100060A" -xmodmap -e "keycode 190 = 0x1100060B" -xmodmap -e "keycode 191 = 0x1100060B" -xmodmap -e "keycode 192 = 0x1100060A" -xmodmap -e "keycode 193 = 0x1100060C" -xmodmap -e "keycode 194 = 0x1100060D" -xmodmap -e "keycode 195 = 0x1100060E" -xmodmap -e "keycode 196 = 0x1100060F" -xmodmap -e "keycode 197 = 0x11000610" -xmodmap -e "keycode 198 = 0x1008ff26" - -# path setup -export QPEDIR=/opt/Qtopia -export PATH=$QPEDIR/bin:$PATH -export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_LIBRARY_PATH - -#tell Qtopia how to inform illume on incoming phone calls -#export ILLUME_PHONE_CALL= -export QTOPIA_PHONE_VENDOR=ficgta01 -export QTOPIA_PHONE_MUX=ficgta01 - - -# Now start Qtopia -exec qpe -- cgit v1.2.3 From 94134f56337a6bf00f6c198516897308385df6a3 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 18 Mar 2008 21:16:04 +0000 Subject: Qtopia/X11: For proper operation timezone information is needed --- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index 2eea6933a1..014d9b8895 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -11,9 +11,9 @@ LICENSE = "GPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" -RDEPENDS = "atd" +RDEPENDS = "atd tzdata" PROVIDES = "qtopia-phone" -PR = "r7" +PR = "r8" SRCREV = "${AUTOREV}" SRC_URI = "git://git.openmoko.org/git/qtopia.git;protocol=git \ file://Xsession.d/99qtopia \ -- cgit v1.2.3 From 5720e8d30a3ebb334540a295eff7c78216759ef8 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 18 Mar 2008 21:37:46 +0000 Subject: Qtopia/X11: Add some more packages to the RDEPENDS --- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb index 014d9b8895..9dfbd8a716 100644 --- a/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb +++ b/packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb @@ -11,7 +11,7 @@ LICENSE = "GPL" PRIORITY = "optional" HOMEPAGE = "http://www.trolltech.com" DEPENDS = "glib-2.0 dbus freetype alsa-lib bluez-libs virtual/libx11 fontconfig xft libxext libxrender libxrandr libxcursor libxtst" -RDEPENDS = "atd tzdata" +RDEPENDS = "atd tzdata tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" PROVIDES = "qtopia-phone" PR = "r8" SRCREV = "${AUTOREV}" -- cgit v1.2.3 From 40faec06b8fac7dd87a1dc0ed25d8d9584a375cc Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Tue, 18 Mar 2008 22:03:33 +0000 Subject: tzdata: Both tzdata and tzdata-dbg provided tzdata, ipkg picked tzdata-dbg. Kill the -dbg package, try to provide a upgrade path The tzdata-dbg package was empty but provided "tzdata". The tzdata package was not empty and provided "tzdata" as well ipkg picked tzdata-dbg resulting in files like /usr/share/zoneinfo/America/New_York missing from the image. Kill the -dbg package, set RREPLACES on the tzdata package, I don't know how to force the update for people that have tzdata-dbg already deployed. --- packages/tzdata/tzdata_2007k.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/tzdata/tzdata_2007k.bb b/packages/tzdata/tzdata_2007k.bb index 2fbe9ac884..fde929de07 100644 --- a/packages/tzdata/tzdata_2007k.bb +++ b/packages/tzdata/tzdata_2007k.bb @@ -3,7 +3,7 @@ SECTION = "base" PRIORITY = "optional" DEPENDS = "tzcode-native" -PR = "r1" +PR = "r2" PROVIDES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ @@ -14,6 +14,8 @@ RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \ timezone-australia timezone-europe timezone-indian \ timezone-iso3166.tab timezone-pacific timezone-zone.tab" +RREPLACES_tzdata = "tzdata-dbg" + SRC_URI = "ftp://elsie.nci.nih.gov/pub/tzdata${PV}.tar.gz" S = "${WORKDIR}" @@ -42,7 +44,7 @@ do_install () { # Packages primarily organized by directory with a major city # in most time zones in the base package -PACKAGES = "${PN}-dbg tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ +PACKAGES = "tzdata tzdata-misc tzdata-posix tzdata-right tzdata-africa \ tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia \ tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific" -- cgit v1.2.3