[oe-commits] org.oe.dev merge of 'b74bbaef312bef5b91193f9733ecea39b3427e18'

mickeyl commit oe at amethyst.openembedded.net
Mon Sep 1 18:27:08 UTC 2008 

merge of 'b74bbaef312bef5b91193f9733ecea39b3427e18'
     and 'd800abb6a82b493cb7014046a6c4a2db09d3b5e4'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 8759c4c48b7324d582f8c37291e9d136b0cbf89f
ViewMTN: http://monotone.openembedded.org/revision/info/8759c4c48b7324d582f8c37291e9d136b0cbf89f
Files:
1
conf/machine/d201gly2.conf
conf/machine/epia.conf
conf/machine/i586-generic.conf
conf/machine/i686-generic.conf
conf/machine/x86-32-nocona.conf
conf/machine/x86-prescott.conf
packages/freesmartphone/frameworkd/a780/frameworkd.conf
packages/freesmartphone/frameworkd/magician/frameworkd.conf
packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf
packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf
packages/freesmartphone/frameworkd_git.bb
Diffs:

#
# mt diff -rb74bbaef312bef5b91193f9733ecea39b3427e18 -r8759c4c48b7324d582f8c37291e9d136b0cbf89f
#
#
#
# patch "conf/machine/d201gly2.conf"
#  from [7e34b9738d6c1869f61708e1fec04db2564f9d89]
#    to [97113084b83b7211329876de47333880994349b0]
# 
# patch "conf/machine/epia.conf"
#  from [e38302e47146701110383c508240fa26398120ba]
#    to [4bcb0b83095cd993c21a4c387cf2cd39efac2c36]
# 
# patch "conf/machine/i586-generic.conf"
#  from [c61d01d967be68b39d6557988891bcf643a627d4]
#    to [3af782751fb8b7bcae5f193c2b2fda7cd1ad2dfc]
# 
# patch "conf/machine/i686-generic.conf"
#  from [5a12326f2dba2449f2f055cb75623cb21bb5efc6]
#    to [de29cc06dc8e3706c30441cf949e0dc910499bf4]
# 
# patch "conf/machine/x86-32-nocona.conf"
#  from [6ec18a5628f4cd6d7ad3b15ba1866eab532bb548]
#    to [83d8d73bff5f9b95729fe22026d3e9e607b4e068]
# 
# patch "conf/machine/x86-prescott.conf"
#  from [1d4653c1ee4503181a0ef606680321a3977ba662]
#    to [f36b8b01933ff0727cab474bd77ab7d5facf4375]
#
============================================================
--- conf/machine/d201gly2.conf	7e34b9738d6c1869f61708e1fec04db2564f9d89
+++ conf/machine/d201gly2.conf	97113084b83b7211329876de47333880994349b0
@@ -22,7 +22,7 @@ IMAGE_FSTYPES = "ext2.gz"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 MACHINE_TASK_PROVIDER = "task-base"
 
============================================================
--- conf/machine/epia.conf	e38302e47146701110383c508240fa26398120ba
+++ conf/machine/epia.conf	4bcb0b83095cd993c21a4c387cf2cd39efac2c36
@@ -12,6 +12,6 @@ IMAGE_FSTYPES = "ext2.gz"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2 x86"
 
 require conf/machine/include/tune-c3.inc
============================================================
--- conf/machine/i586-generic.conf	c61d01d967be68b39d6557988891bcf643a627d4
+++ conf/machine/i586-generic.conf	3af782751fb8b7bcae5f193c2b2fda7cd1ad2dfc
@@ -20,7 +20,7 @@ IMAGE_FSTYPES ?= "ext2.gz"
 
 IMAGE_FSTYPES ?= "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
 
============================================================
--- conf/machine/i686-generic.conf	5a12326f2dba2449f2f055cb75623cb21bb5efc6
+++ conf/machine/i686-generic.conf	de29cc06dc8e3706c30441cf949e0dc910499bf4
@@ -19,7 +19,7 @@ IMAGE_FSTYPES ?= "ext2.gz"
 
 IMAGE_FSTYPES ?= "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
 #tune for pentium pro cpu
============================================================
--- conf/machine/x86-32-nocona.conf	6ec18a5628f4cd6d7ad3b15ba1866eab532bb548
+++ conf/machine/x86-32-nocona.conf	83d8d73bff5f9b95729fe22026d3e9e607b4e068
@@ -17,7 +17,7 @@ IMAGE_FSTYPES = "ext2.gz"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
 
============================================================
--- conf/machine/x86-prescott.conf	1d4653c1ee4503181a0ef606680321a3977ba662
+++ conf/machine/x86-prescott.conf	f36b8b01933ff0727cab474bd77ab7d5facf4375
@@ -16,7 +16,7 @@ IMAGE_FSTYPES = "ext2.gz"
 
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2 x86"
+MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost acpi ext2 x86"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 
 


#
# mt diff -rd800abb6a82b493cb7014046a6c4a2db09d3b5e4 -r8759c4c48b7324d582f8c37291e9d136b0cbf89f
#
#
#
# patch "packages/freesmartphone/frameworkd/a780/frameworkd.conf"
#  from [2c8e9ed6b3301fc069f677a28c6bb7dfec1e35ee]
#    to [6e46480377b7fc9d31744bd843d0faad8f65a263]
# 
# patch "packages/freesmartphone/frameworkd/magician/frameworkd.conf"
#  from [6c951b8c68fd4a7515677bb251edcee52648e04c]
#    to [e46d0710524363feaa49d4dd8244cdf7d45ba5f8]
# 
# patch "packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf"
#  from [b0ba7ea2cfe4dcba9828b27cf52bd1bc7274dee6]
#    to [040c6fdc058edc68dbc8e89ed4c5522bafe23e72]
# 
# patch "packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf"
#  from [a0b3e8d263d2f7a745291efc50eab5ddafea8d8c]
#    to [45fb306e7266afa152e0e9f376c64d1b36b6f86d]
# 
# patch "packages/freesmartphone/frameworkd_git.bb"
#  from [fb0260924225b0c8aa28c4ec9290819c11e7f543]
#    to [94282092330a8a0df7d9b488b224bda765e10cc9]
#
============================================================
--- packages/freesmartphone/frameworkd/a780/frameworkd.conf	2c8e9ed6b3301fc069f677a28c6bb7dfec1e35ee
+++ packages/freesmartphone/frameworkd/a780/frameworkd.conf	6e46480377b7fc9d31744bd843d0faad8f65a263
@@ -5,7 +5,7 @@ report2 = POWER,key,116,1
 # keys (copied from Openmoko, need to adjust)
 report1 = AUX,key,169,1
 report2 = POWER,key,116,1
-report3 = CHARGER,key,356,0
+report3 = USB,key,356,0
 report4 = HEADSET,switch,2,0
 
 [ogsmd]
============================================================
--- packages/freesmartphone/frameworkd/magician/frameworkd.conf	6c951b8c68fd4a7515677bb251edcee52648e04c
+++ packages/freesmartphone/frameworkd/magician/frameworkd.conf	e46d0710524363feaa49d4dd8244cdf7d45ba5f8
@@ -7,7 +7,7 @@ report2 = POWER,key,116,1
 report1 = AUX,key,212,1
 report2 = POWER,key,116,1
 # magician doesn't use KEY_POWER2 for the charger, need to fix
-report3 = CHARGER,key,356,0
+report3 = USB,key,356,0
 report4 = HEADSET,switch,2,0
 
 [ogsmd]
============================================================
--- packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf	b0ba7ea2cfe4dcba9828b27cf52bd1bc7274dee6
+++ packages/freesmartphone/frameworkd/om-gta01/frameworkd.conf	040c6fdc058edc68dbc8e89ed4c5522bafe23e72
@@ -11,7 +11,7 @@ report2 = POWER,key,116,1
 # Keys
 report1 = AUX,key,169,1
 report2 = POWER,key,116,1
-report3 = CHARGER,key,356,0
+report3 = USB,key,356,0
 report4 = HEADSET,switch,2,0
 
 [ogsmd]
============================================================
--- packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf	a0b3e8d263d2f7a745291efc50eab5ddafea8d8c
+++ packages/freesmartphone/frameworkd/om-gta02/frameworkd.conf	45fb306e7266afa152e0e9f376c64d1b36b6f86d
@@ -17,7 +17,7 @@ report2 = POWER,key,116,1
 # keys
 report1 = AUX,key,169,1
 report2 = POWER,key,116,1
-report3 = CHARGER,key,356,0
+report3 = USB,key,356,0
 report4 = HEADSET,switch,2,0
 
 # disable accelerometer since it uses LOADS of CPU resources
============================================================
--- packages/freesmartphone/frameworkd_git.bb	fb0260924225b0c8aa28c4ec9290819c11e7f543
+++ packages/freesmartphone/frameworkd_git.bb	94282092330a8a0df7d9b488b224bda765e10cc9
@@ -5,7 +5,7 @@ PV = "0.8.2+gitr${SRCREV}"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.8.2+gitr${SRCREV}"
-PR = "r2"
+PR = "r3"
 
 inherit distutils update-rc.d
 
@@ -42,6 +42,7 @@ RRECOMMENDS_${PN} += "\
   ppp \
 "
 
+# recommend MUXer on platforms that require one
 RRECOMMENDS_${PN}_append_om-gta01 = "gsm0710muxd"
 RRECOMMENDS_${PN}_append_om-gta02 = "gsm0710muxd"

More information about the Openembedded-commits mailing list