[oe-commits] org.oe.dev merge of '5bb8dd4df9a12509e1f1ff695bf5e3417da6ace6'

[oe commit]

merge of '5bb8dd4df9a12509e1f1ff695bf5e3417da6ace6'
     and 'eba154367679f74d07e194d2995c74b2810109a2'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: b638dabea28c2f55620b864802640db88e6cae38
ViewMTN: http://monotone.openembedded.org/revision/info/b638dabea28c2f55620b864802640db88e6cae38
Files:
1
packages/linux/linux-ezx-2.6.23/a780/defconfig
packages/linux/linux-ezx_2.6.23.bb
conf/distro/include/angstrom-2007-preferred-versions.inc
Diffs:

#
# mt diff -r5bb8dd4df9a12509e1f1ff695bf5e3417da6ace6 -rb638dabea28c2f55620b864802640db88e6cae38
#
# 
# 
# patch "packages/linux/linux-ezx-2.6.23/a780/defconfig"
#  from [e941dce52ebce9f863e32e0b94b9b4b2d34169df]
#    to [b275e2c7df1de45f5fb7e065b207c4427b79b22d]
# 
# patch "packages/linux/linux-ezx_2.6.23.bb"
#  from [50f4589a2f72c7f5d91c29d0cc05fe83cde5193d]
#    to [9a2603bc3690e0fabdce03bdc1fe5ad27517c778]
# 
============================================================
--- packages/linux/linux-ezx-2.6.23/a780/defconfig	e941dce52ebce9f863e32e0b94b9b4b2d34169df
+++ packages/linux/linux-ezx-2.6.23/a780/defconfig	b275e2c7df1de45f5fb7e065b207c4427b79b22d
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.23.1
-# Mon Oct 29 19:21:10 2007
+# Wed Oct 31 09:05:11 2007
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -206,7 +206,7 @@ CONFIG_TICK_ONESHOT=y
 # Kernel Features
 #
 CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
+# CONFIG_NO_HZ is not set
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_PREEMPT=y
 CONFIG_HZ=100
============================================================
--- packages/linux/linux-ezx_2.6.23.bb	50f4589a2f72c7f5d91c29d0cc05fe83cde5193d
+++ packages/linux/linux-ezx_2.6.23.bb	9a2603bc3690e0fabdce03bdc1fe5ad27517c778
@@ -1,8 +1,8 @@ EZX = "ezxdev"
 DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and E680"
 AUTHOR = "The OpenEZX Team <openezx-devel at lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
 EZX = "ezxdev"
-PR = "${EZX}-r1"
+PR = "${EZX}-r2"
 
 # unstable branch, use 2.6.21 if you want something working
 DEFAULT_PREFERENCE = "-99"


#
# mt diff -reba154367679f74d07e194d2995c74b2810109a2 -rb638dabea28c2f55620b864802640db88e6cae38
#
# 
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [913ecac98860fe4b30ebace43de31d2b0170a40b]
#    to [97977f93fe66a8d12f41a9e4f01ed591efe268d8]
# 
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	913ecac98860fe4b30ebace43de31d2b0170a40b
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	97977f93fe66a8d12f41a9e4f01ed591efe268d8
@@ -1044,7 +1044,7 @@ PREFERRED_VERSION_libtifiles ?= "0.6.5"
 PREFERRED_VERSION_libticables ?= "3.9.2"
 PREFERRED_VERSION_libticalcs ?= "4.5.9"
 PREFERRED_VERSION_libtifiles ?= "0.6.5"
-PREFERRED_VERSION_libtinymail ?= "0.0.1"
+PREFERRED_VERSION_libtinymail ?= "0.0.3"
 PREFERRED_VERSION_libtododb ?= "0.11"
 PREFERRED_VERSION_libtomcrypt ?= "0.97b"
 PREFERRED_VERSION_libtomoe-gtk ?= "0.1.0"