[oe-commits] org.oe.dev merge of '7dac65b6187ea9281e5a7ff6b68e832c04a92af8'

[oe commit]

merge of '7dac65b6187ea9281e5a7ff6b68e832c04a92af8'
     and '9dce9395fcd011a1d238dcb5a559a08d851dc80e'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 7f5ba340e271c445c23560f9969719cfb63b8649
ViewMTN: http://monotone.openembedded.org/revision/info/7f5ba340e271c445c23560f9969719cfb63b8649
Files:
1
classes/kernel-arch.bbclass
packages/opie-dasher
packages/nonworking/opie-dasher
packages/libqpe/libqpe-opie/citytime-path.patch
classes/opie.bbclass
classes/palmtop.bbclass
packages/libqpe/libqpe-opie_1.2.3.bb
packages/libqpe/libqpe-opie_cvs.bb
Diffs:

#
# mt diff -r7dac65b6187ea9281e5a7ff6b68e832c04a92af8 -r7f5ba340e271c445c23560f9969719cfb63b8649
#
#
#
# patch "classes/kernel-arch.bbclass"
#  from [a483a48991725bddaa414801e036e80ca754b603]
#    to [e0da174bc26d21c14a561295a816a06702165ce5]
#
============================================================
--- classes/kernel-arch.bbclass	a483a48991725bddaa414801e036e80ca754b603
+++ classes/kernel-arch.bbclass	e0da174bc26d21c14a561295a816a06702165ce5
@@ -32,8 +32,10 @@ def map_uboot_arch(a, d):
 export ARCH = "${@map_kernel_arch(bb.data.getVar('TARGET_ARCH', d, 1), d)}"
 
 def map_uboot_arch(a, d):
-	if a == "powerpc":
-		return "ppc"
+	import re
+
+	if   re.match('powerpc$', a): return 'ppc'
+	elif re.match('i.86$', a): return 'x86'
 	return a
 
 export UBOOT_ARCH = "${@map_uboot_arch(bb.data.getVar('ARCH', d, 1), d)}"


#
# mt diff -r9dce9395fcd011a1d238dcb5a559a08d851dc80e -r7f5ba340e271c445c23560f9969719cfb63b8649
#
#
#
# rename "packages/opie-dasher"
#     to "packages/nonworking/opie-dasher"
# 
# add_file "packages/libqpe/libqpe-opie/citytime-path.patch"
#  content [e3f95dd0bb4b166d7b1bb48e28f0fc6ea63aa372]
# 
# patch "classes/opie.bbclass"
#  from [3520a2c069712e9db8ce48af55f65b869bd6b9fd]
#    to [ed3321a9ae1152bdd9852909d6fae887c7453365]
# 
# patch "classes/palmtop.bbclass"
#  from [56d2e8dc703cfb39ea14ec0fc013546fcd6a20bb]
#    to [a14ffdac1a4f7fbd2aade9ceab8d395a394228ca]
# 
# patch "packages/libqpe/libqpe-opie_1.2.3.bb"
#  from [582b244b7c4fb04f2264278eed3f0b0f45fd881c]
#    to [8c32d00717f267664f0048b023897704ed2bb6b3]
# 
# patch "packages/libqpe/libqpe-opie_cvs.bb"
#  from [f276b9b611e6c72c97af9cae949f23dbd6ad44d7]
#    to [be52a99adac40130cb88d4913f74745c2f7b574e]
#
============================================================
--- packages/libqpe/libqpe-opie/citytime-path.patch	e3f95dd0bb4b166d7b1bb48e28f0fc6ea63aa372
+++ packages/libqpe/libqpe-opie/citytime-path.patch	e3f95dd0bb4b166d7b1bb48e28f0fc6ea63aa372
@@ -0,0 +1,11 @@
+--- library/tzselect.cpp.orig	2008-01-12 21:05:49.000000000 +1300
++++ library/tzselect.cpp	2008-01-12 21:06:01.000000000 +1300
+@@ -273,7 +273,7 @@
+ void TimeZoneSelector::slotExecute( void )
+ {
+   // execute the world time application...
+-  if (QFile::exists(QPEApplication::qpeDir()+"bin/citytime"))
++  if (QFile::exists(OPIE_BINDIR "/citytime"))
+     Global::execute( "citytime" );
+   else
+     QMessageBox::warning(this,tr("citytime executable not found"),
============================================================
--- classes/opie.bbclass	3520a2c069712e9db8ce48af55f65b869bd6b9fd
+++ classes/opie.bbclass	ed3321a9ae1152bdd9852909d6fae887c7453365
@@ -22,7 +22,6 @@ EXTRA_QMAKEVARS_POST += " DESTDIR=${S} "
 # to be consistent, put all targets into workdir
 # NOTE: leave one space at the end, other files are expecting that
 EXTRA_QMAKEVARS_POST += " DESTDIR=${S} "
-EXTRA_QMAKEVARS_POST += " DEFINES+=OPIE_BINDIR='\"${bindir}\"' DEFINES+=OPIE_LIBDIR='\"${libdir}/opie/lib\"' DEFINES+=OPIE_QTDIR='\"${libdir}/opie\"' "
 
 # Opie standard TAG value
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
============================================================
--- classes/palmtop.bbclass	56d2e8dc703cfb39ea14ec0fc013546fcd6a20bb
+++ classes/palmtop.bbclass	a14ffdac1a4f7fbd2aade9ceab8d395a394228ca
@@ -17,6 +17,7 @@ QT_LIBRARY = '${@base_conditional("PALMT
 EXTRA_QMAKEVARS_POST += "${@["LIBS+=-lqpe ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
 DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
 QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
+EXTRA_QMAKEVARS_POST += " DEFINES+=OPIE_BINDIR='\"${bindir}\"' DEFINES+=OPIE_LIBDIR='\"${libdir}/opie/lib\"' DEFINES+=OPIE_QTDIR='\"${libdir}/opie\"' "
 
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
 FILES_${PN} += " ${palmtopdir} "
============================================================
--- packages/libqpe/libqpe-opie_1.2.3.bb	582b244b7c4fb04f2264278eed3f0b0f45fd881c
+++ packages/libqpe/libqpe-opie_1.2.3.bb	8c32d00717f267664f0048b023897704ed2bb6b3
@@ -1,9 +1,11 @@ require ${PN}.inc
 require ${PN}.inc
 
+PR = "r1"
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
            file://fix-titleheight.patch;patch=1 \
            file://unbreak-logging.patch;patch=1 \
+           file://citytime-path.patch;patch=1 \
           "
 
============================================================
--- packages/libqpe/libqpe-opie_cvs.bb	f276b9b611e6c72c97af9cae949f23dbd6ad44d7
+++ packages/libqpe/libqpe-opie_cvs.bb	be52a99adac40130cb88d4913f74745c2f7b574e
@@ -1,9 +1,11 @@ require ${PN}.inc
 require ${PN}.inc
 
+PR = "r1"
 PV = "1.2.3+cvs${SRCDATE}"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/library \
            file://fix-titleheight.patch;patch=1 \
            file://unbreak-logging.patch;patch=1 \
+           file://citytime-path.patch;patch=1 \
           "