[oe-commits] org.oe.dev merge of '0d06ef20f42dbc757e10ca1639e06561c357d92d'
john_lee commit
oe at amethyst.openembedded.net
Fri Apr 25 15:42:00 UTC 2008
merge of '0d06ef20f42dbc757e10ca1639e06561c357d92d'
and '3497897aabefa260ab1125e79f685e5829fbf106'
Author: john_lee at openembedded.org
Branch: org.openembedded.dev
Revision: 708ea5b7d9962a09f47478c7fca40a60f230f8cb
ViewMTN: http://monotone.openembedded.org/revision/info/708ea5b7d9962a09f47478c7fca40a60f230f8cb
Files:
1
packages/qtopia-phone/qtopia-phone-x11/fic-gta02
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h
packages/qtopia-phone/qtopia-phone-x11/Xsession.d
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d
packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia
packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia
packages/openmoko-tools/pty-forward-native.bb
packages/openmoko-tools/serial-forward.bb
conf/distro/include/sane-srcrevs.inc
packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb
packages/tzdata/tzdata_2007k.bb
packages/alsa/alsa-state.bb
packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb
Diffs:
#
# mt diff -r0d06ef20f42dbc757e10ca1639e06561c357d92d -r708ea5b7d9962a09f47478c7fca40a60f230f8cb
#
#
#
# delete "packages/qtopia-phone/qtopia-phone-x11/fic-gta02"
#
# delete "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/device-conf"
#
# delete "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/qplatformdefs.h"
#
# rename "packages/qtopia-phone/qtopia-phone-x11/Xsession.d"
# to "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d"
#
# rename "packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia"
# to "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia"
#
# add_dir "packages/qtopia-phone/qtopia-phone-x11/fic-gta02"
#
# add_file "packages/openmoko-tools/pty-forward-native.bb"
# content [17c7e0ad0fe30607be9326cec651ccf4ee86b4b8]
#
# add_file "packages/openmoko-tools/serial-forward.bb"
# content [32434a87a886be4c262ea2f13af0375bae297e48]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [654a057d03534ed2c8de8c0a9ff578b6aaf9bbde]
# to [f27fc62dcfe355dcbf06e7a04282314fd5a3a7cf]
#
# patch "packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia"
# from [8aa8d733fbdbb97a512816a89d64a38de5d7ca55]
# to [54bf1406f00aebb9f05186ae64e99cd38f45ef0b]
#
# patch "packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb"
# from [3499b3560c9eb16353ef331101f9fa2075374572]
# to [d410359003086e0e79d452ced03bb87f9747df45]
#
# patch "packages/tzdata/tzdata_2007k.bb"
# from [ca74a46ba89c18fd4de893f2e4e288e86d2fb159]
# to [56201753cfbe50b131cbc65a13fcd804ebfbeec6]
#
============================================================
--- packages/openmoko-tools/pty-forward-native.bb 17c7e0ad0fe30607be9326cec651ccf4ee86b4b8
+++ packages/openmoko-tools/pty-forward-native.bb 17c7e0ad0fe30607be9326cec651ccf4ee86b4b8
@@ -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
+
============================================================
--- packages/openmoko-tools/serial-forward.bb 32434a87a886be4c262ea2f13af0375bae297e48
+++ packages/openmoko-tools/serial-forward.bb 32434a87a886be4c262ea2f13af0375bae297e48
@@ -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}
+}
============================================================
--- conf/distro/include/sane-srcrevs.inc 654a057d03534ed2c8de8c0a9ff578b6aaf9bbde
+++ conf/distro/include/sane-srcrevs.inc f27fc62dcfe355dcbf06e7a04282314fd5a3a7cf
@@ -141,6 +141,7 @@ SRCREV_pn-psplash ?= "249"
SRCREV_pn-opkg-native ?= "4142"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-psplash ?= "249"
+SRCREV_pn-pty-forward-native ?= "4214"
SRCREV_pn-pylgrim ?= "20"
SRCREV_pn-pyneod ?= "88"
SRCREV_pn-pyneog ?= "88"
@@ -148,6 +149,7 @@ SRCREV_pn-s3c24xx-gpio ?= "4130"
SRCREV_pn-python-gsmd = "127"
SRCREV_pn-python-lightmediascanner = "68"
SRCREV_pn-s3c24xx-gpio ?= "4130"
+SRCREV_pn-serial-forward ?= "4214"
SRCREV_pn-settings-daemon ?= "1755"
SRCREV_pn-sjf2410-linux-native ?= "933"
SRCREV_pn-sphyrna ?= "45"
============================================================
--- packages/qtopia-phone/qtopia-phone-x11/Xsession.d/99qtopia 8aa8d733fbdbb97a512816a89d64a38de5d7ca55
+++ packages/qtopia-phone/qtopia-phone-x11/fic-gta02/Xsession.d/89qtopia 54bf1406f00aebb9f05186ae64e99cd38f45ef0b
@@ -28,7 +28,9 @@ export LD_LIBRARY_PATH=$QPEDIR/lib:$LD_L
#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 &
-exec qpe
============================================================
--- packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb 3499b3560c9eb16353ef331101f9fa2075374572
+++ packages/qtopia-phone/qtopia-phone-x11_4.3.1.bb d410359003086e0e79d452ced03bb87f9747df45
@@ -11,12 +11,11 @@ DEPENDS = "glib-2.0 dbus freetype alsa-l
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 tzdata-africa tzdata-americas tzdata-antarctica tzdata-arctic tzdata-asia tzdata-atlantic tzdata-australia tzdata-europe tzdata-pacific"
PROVIDES = "qtopia-phone"
-PR = "r4"
+PR = "r8"
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,55 +30,47 @@ TARGET-DEVICE="${@base_contains('MACHINE
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_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"
+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 at 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_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
-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
+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
}
@@ -94,7 +85,7 @@ do_install() {
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
@@ -118,12 +109,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}-dev += "${OE_QT_RPREFIX}/lib/*.so"
+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_PREFIX}/lib/*.so"
+
============================================================
--- packages/tzdata/tzdata_2007k.bb ca74a46ba89c18fd4de893f2e4e288e86d2fb159
+++ packages/tzdata/tzdata_2007k.bb 56201753cfbe50b131cbc65a13fcd804ebfbeec6
@@ -3,7 +3,7 @@ DEPENDS = "tzcode-native"
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 t
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"
#
# mt diff -r3497897aabefa260ab1125e79f685e5829fbf106 -r708ea5b7d9962a09f47478c7fca40a60f230f8cb
#
#
#
# patch "packages/alsa/alsa-state.bb"
# from [04a21acd1a3c8a25e536a0f87bf515c1909367e0]
# to [64e43b8b24e43885d00500fd5632f439c9579f8f]
#
# patch "packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb"
# from [9bb8f7f724382e4eefd1ee89dda392bc20c877d0]
# to [e1f3c6005921ab55b52314b04e7769b3827b4dbf]
#
============================================================
--- packages/alsa/alsa-state.bb 04a21acd1a3c8a25e536a0f87bf515c1909367e0
+++ packages/alsa/alsa-state.bb 64e43b8b24e43885d00500fd5632f439c9579f8f
@@ -8,7 +8,7 @@ PV = "0.1.0"
LICENSE = "GPL"
RRECOMMENDS_alsa-state = "alsa-states"
PV = "0.1.0"
-PR = "r13"
+PR = "r14"
SRC_URI = " \
file://asoundrc \
============================================================
--- packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb 9bb8f7f724382e4eefd1ee89dda392bc20c877d0
+++ packages/u-boot/u-boot-openmoko_1.3.1+git+svn.bb e1f3c6005921ab55b52314b04e7769b3827b4dbf
@@ -4,7 +4,7 @@ PRIORITY = "optional"
SECTION = "bootloader"
PRIORITY = "optional"
-UBOOT_UPSTREAM_REV = "10bbb38a402a2faf18858c451bcdc63d45888e6e"
+UBOOT_UPSTREAM_REV = "b29661fc1151077776454288051bc9a488351ce8"
UBOOT_MACHINES = "gta01bv2 gta01bv3 gta01bv4 gta02v2 gta02v3 gta02v4 gta02v5"
SRCREV_FORMAT = "+gitupstream+svnpatchset"
More information about the Openembedded-commits
mailing list