[oe-commits] org.oe.dev merge of '9f4762fefb2d3e6f2dc2cbd105e2eed072efb9cb'

xora commit openembedded-commits at lists.openembedded.org
Tue Oct 16 13:46:11 UTC 2007


merge of '9f4762fefb2d3e6f2dc2cbd105e2eed072efb9cb'
     and 'fb5125d70e364a6aa1db0ab80f84a840cc8e6be8'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 4f77470c64f631cf18c5d73d963e41e28fe097bb
ViewMTN: http://monotone.openembedded.org/revision/info/4f77470c64f631cf18c5d73d963e41e28fe097bb
Files:
1
conf/distro/include/sane-srcrevs.inc
packages/linux/linux-bfin/adzs-bf548-ezlite/defconfig
packages/tasks/task-openmoko.bb
Diffs:

#
# mt diff -r9f4762fefb2d3e6f2dc2cbd105e2eed072efb9cb -r4f77470c64f631cf18c5d73d963e41e28fe097bb
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [03549bc6f28d0c3f8bfa8902fb00c9c9a33d244b]
#    to [20a517059661d41439c3a887c4222a0ecf489389]
# 
# patch "packages/linux/linux-bfin/adzs-bf548-ezlite/defconfig"
#  from [3bfd630e3924e99334533b1cb8ffdce07de96cb7]
#    to [cc15cda7d452e91dd810cf9f70c76ef47053cca7]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	03549bc6f28d0c3f8bfa8902fb00c9c9a33d244b
+++ conf/distro/include/sane-srcrevs.inc	20a517059661d41439c3a887c4222a0ecf489389
@@ -25,7 +25,7 @@ SRCREV_pn-libxosd ?= "627"
 SRCREV_pn-libmokoui2 ?= "3111"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libxosd ?= "627"
-SRCREV_pn-linux-bfin ?= "3727"
+SRCREV_pn-linux-bfin ?= "3731"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
============================================================
--- packages/linux/linux-bfin/adzs-bf548-ezlite/defconfig	3bfd630e3924e99334533b1cb8ffdce07de96cb7
+++ packages/linux/linux-bfin/adzs-bf548-ezlite/defconfig	cc15cda7d452e91dd810cf9f70c76ef47053cca7
@@ -993,7 +993,7 @@ CONFIG_TOUCHSCREEN_ADS7846=m
 # CONFIG_INPUT_TABLET is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ADS7846=m
-# CONFIG_TOUCHSCREEN_AD7877 is not set
+CONFIG_TOUCHSCREEN_AD7877=m
 CONFIG_TOUCHSCREEN_GUNZE=m
 CONFIG_TOUCHSCREEN_ELO=m
 CONFIG_TOUCHSCREEN_MTOUCH=m


#
# mt diff -rfb5125d70e364a6aa1db0ab80f84a840cc8e6be8 -r4f77470c64f631cf18c5d73d963e41e28fe097bb
#
# 
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [853e5cf4effc206059d9e3955df4a6d161c7188b]
#    to [870be401b6ac910ccf7cbc8611c17b7ebeb32882]
# 
============================================================
--- packages/tasks/task-openmoko.bb	853e5cf4effc206059d9e3955df4a6d161c7188b
+++ packages/tasks/task-openmoko.bb	870be401b6ac910ccf7cbc8611c17b7ebeb32882
@@ -1,8 +1,8 @@ PROVIDES = "task-openmoko-everything"
 DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-PR = "r65"
+PR = "r66"
 
 inherit task
 
@@ -135,6 +135,8 @@ RDEPENDS_task-openmoko-pim = "\
   openmoko-contacts2 \
   openmoko-dates2 \
   openmoko-feedreader2 \
+  openmoko-browser2 \
+  openmoko-appmanager2 \
   openmoko-tasks2 \
   openmoko-mediaplayer2 \
 #  openmoko-messages \






More information about the Openembedded-commits mailing list