[oe-commits] org.oe.dev merge of '22e3927191bf5e773e6ac986169f1d250ad2902e'

[mickeyl commit]

merge of '22e3927191bf5e773e6ac986169f1d250ad2902e'
     and '8a78637dc8745f64d6ed43a79d5920abbc1ec456'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 0c44e333167e8a9f7bda77e7980744c0955cf04d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0c44e333167e8a9f7bda77e7980744c0955cf04d
Files:
1
packages/bluez/bluez-utils.inc
classes/openmoko2.bbclass
Diffs:

#
# mt diff -r22e3927191bf5e773e6ac986169f1d250ad2902e -r0c44e333167e8a9f7bda77e7980744c0955cf04d
#
# 
# 
# 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"


#
# mt diff -r8a78637dc8745f64d6ed43a79d5920abbc1ec456 -r0c44e333167e8a9f7bda77e7980744c0955cf04d
#
# 
# 
# add_file "classes/openmoko2.bbclass"
#  content [80c28ba30fcb1a7997d64595641141f1a49e3c68]
# 
============================================================
--- classes/openmoko2.bbclass	80c28ba30fcb1a7997d64595641141f1a49e3c68
+++ classes/openmoko2.bbclass	80c28ba30fcb1a7997d64595641141f1a49e3c68
@@ -0,0 +1,28 @@
+inherit autotools pkgconfig
+
+HOMEPAGE = "http://www.openmoko.org"
+OPENMOKO_RELEASE ?= "OM-2007.2"
+OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk"
+
+def openmoko_two_get_license(d):
+    import bb
+    openmoko, section = bb.data.getVar('SECTION', d, 1).split("/")
+    return "LGPL GPL".split()[section != "libs"]
+
+def openmoko_two_get_subdir(d):
+    import bb
+    openmoko, section = bb.data.getVar('SECTION', d, 1).split("/")
+    if section == 'base': return ""
+    elif section == 'libs': return "libraries"
+    elif section in 'apps tools pim'.split(): return "applications"
+    elif section == "panel-plugin": return "panel-plugins"
+    elif section == "inputmethods": return "inputmethods"
+    else: return section
+
+LICENSE = "${@openmoko_two_get_license(d)}"
+SUBDIR = "${@openmoko_two_get_subdir(d)}"
+
+SRC_URI := "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/${SUBDIR};module=${PN};proto=http"
+S = "${WORKDIR}/${PN}"
+
+FILES_${PN} += "${datadir}/icons"