[oe-commits] org.oe.dev merge of '21cc63203b5df2e8d90f0a909db0ffa185502b72'

[koen commit]

merge of '21cc63203b5df2e8d90f0a909db0ffa185502b72'
     and 'f87475ccf1fd18294a9edb79090422cc8f201753'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 8a78637dc8745f64d6ed43a79d5920abbc1ec456
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8a78637dc8745f64d6ed43a79d5920abbc1ec456
Files:
1
classes/openmoko-panel-plugin.bbclass
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
packages/bluez/bluez-utils.inc
Diffs:

#
# mt diff -r21cc63203b5df2e8d90f0a909db0ffa185502b72 -r8a78637dc8745f64d6ed43a79d5920abbc1ec456
#
# 
# 
# patch "classes/openmoko-panel-plugin.bbclass"
#  from [ab5e8526c41ab342808418a27680dd97b13f18c3]
#    to [012f38a2bf927dd13a92d1a76a02c43173db369f]
# 
# patch "conf/machine/fic-gta01.conf"
#  from [1c8e90287feedbc8f33cb1859b4e13cbf1007c10]
#    to [466d77dadd32f0dc79d242207f09ccd87533b0aa]
# 
# patch "conf/machine/fic-gta02.conf"
#  from [35a3ed508f3117b908249db21b5778bc4578be37]
#    to [02cbabf3237da327316e9124d6c52fce6776baeb]
# 
============================================================
--- classes/openmoko-panel-plugin.bbclass	ab5e8526c41ab342808418a27680dd97b13f18c3
+++ classes/openmoko-panel-plugin.bbclass	012f38a2bf927dd13a92d1a76a02c43173db369f
@@ -1,6 +1,6 @@ DEPENDS += "matchbox-panel-2"
 SECTION = "openmoko/panel-plugin"
 DEPENDS += "matchbox-panel-2"
 
-inherit openmoko
+inherit openmoko2
 
 FILES_${PN} = "${libdir}/matchbox-panel/lib*.so* ${datadir}"
============================================================
--- conf/machine/fic-gta01.conf	1c8e90287feedbc8f33cb1859b4e13cbf1007c10
+++ conf/machine/fic-gta01.conf	466d77dadd32f0dc79d242207f09ccd87533b0aa
@@ -35,8 +35,8 @@ EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4
 # extra jffs2 tweaks
 EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
 
-# build tools
-EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
+# build / upload tools
+EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
 
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.conf
============================================================
--- conf/machine/fic-gta02.conf	35a3ed508f3117b908249db21b5778bc4578be37
+++ conf/machine/fic-gta02.conf	02cbabf3237da327316e9124d6c52fce6776baeb
@@ -1,7 +1,7 @@
 #-----------------------------------------------------------------------------
 #@TYPE: Machine
 #@NAME: FIC GTA02 (Neo1973)
-#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone
+#@DESCRIPTION: Machine configuration for the FIC Neo1973.2 GSM phone
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
@@ -32,10 +32,10 @@ ROOT_FLASH_SIZE = "256"
 ROOT_FLASH_SIZE = "256"
 
 # extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 -n"
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
 
-# build tools
-EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
+# build / upload tools
+EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"
 
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.conf


#
# mt diff -rf87475ccf1fd18294a9edb79090422cc8f201753 -r8a78637dc8745f64d6ed43a79d5920abbc1ec456
#
# 
# 
# patch "packages/bluez/bluez-utils.inc"
#  from [13716750ab0571681b9e8449ea1ce394c881897e]
#    to [1f441bd0eaa3829668270c8d41ff96df7bc33e8d]
# 
============================================================
--- packages/bluez/bluez-utils.inc	13716750ab0571681b9e8449ea1ce394c881897e
+++ packages/bluez/bluez-utils.inc	1f441bd0eaa3829668270c8d41ff96df7bc33e8d
@@ -1,7 +1,7 @@ PRIORITY = "optional"
 DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
 SECTION = "console"
 PRIORITY = "optional"
-DEPENDS = "bluez-libs-${PV} dbus cups"
+DEPENDS = "bluez-libs-${PV} libusb dbus cups"
 PROVIDES = "bluez-utils-dbus"
 RPROVIDES_${PN} = "bluez-pan bluez-sdp bluez-utils-dbus"
 RREPLACES = "bluez-utils-dbus"