From c7c63bea2a099074f7158c8236cc7ad6402dbd78 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 30 Jul 2013 14:48:34 +0100 Subject: bluez5: Add obex-profiles as a PACKAGECONFIG, package obexd separately --enable-obex controls if obexd supports extra profiles (currently IRMC and PBAB), which brings in a dependency on libical for the dummy phonebook implementation. Based on work by Saul Wold . Signed-off-by: Ross Burton Signed-off-by: Saul Wold --- meta/recipes-connectivity/bluez5/bluez5.inc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index 36a606195e..2fae7fbccc 100644 --- a/meta/recipes-connectivity/bluez5/bluez5.inc +++ b/meta/recipes-connectivity/bluez5/bluez5.inc @@ -6,12 +6,13 @@ LICENSE = "GPLv2+ & LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://COPYING.LIB;md5=fb504b67c50331fc78734fed90fb0e09 \ file://src/main.c;beginline=1;endline=24;md5=9bc54b93cd7e17bf03f52513f39f926e" -DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck libical readline" +DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline" RCONFLICTS_${PN} = "bluez4" -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} obex-profiles" PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" +PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" SRC_URI = "\ ${KERNELORG_MIRROR}/linux/bluetooth/bluez-${PV}.tar.gz \ @@ -53,7 +54,7 @@ do_install_append() { } ALLOW_EMPTY_libasound-module-bluez = "1" -PACKAGES =+ "libasound-module-bluez ${PN}-test" +PACKAGES =+ "libasound-module-bluez ${PN}-test ${PN}-obex" FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so ${datadir}/alsa" FILES_${PN} += "${libdir}/bluetooth/plugins ${libdir}/bluetooth/plugins/*.so ${base_libdir}/udev/ ${nonarch_base_libdir}/udev/ ${systemd_unitdir}/ ${datadir}/dbus-1" @@ -62,6 +63,12 @@ FILES_${PN}-dev += "\ ${libdir}/alsa-lib/*.la \ " +FILES_${PN}-obex = "${libdir}/bluez5/bluetooth/obexd \ + ${libdir}/systemd/user/obex.service \ + ${datadir}/dbus-1/services/org.bluez.obex.service \ + " +SYSTEMD_SERVICE_${PN}-obex = "obex.service" + FILES_${PN}-test = "${libdir}/bluez/test/*" FILES_${PN}-dbg += "\ -- cgit 1.2.3-korg ud'>thud OpenEmbedded Core layerGrokmirror user
summaryrefslogtreecommitdiffstats
path: root/meta/conf/toasterconf.json
blob: fe1564ec264b54c60d04234631d4bc62b33577c2 (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84

{
    "config": {"MACHINE": "qemux86", "DISTRO": "poky"},
    "layersources": [
        {
            "name": "Local OpenEmbedded",
            "sourcetype": "local",
            "apiurl": "../../",
            "branches": ["HEAD", "master", "dizzy"],
            "layers": [
                {
                    "name": "openembedded-core",
                    "local_path": "meta",
                    "vcs_url": "remote:origin",
                    "dirpath": "meta"
                }
            ]
        },
        {
            "name": "OpenEmbedded",
            "sourcetype": "layerindex",
            "apiurl": "http://layers.openembedded.org/layerindex/api/",
            "branches": ["master", "dizzy"]
        },
        {
            "name": "Imported layers",
            "sourcetype": "imported",
            "apiurl": "",
            "branches": ["master", "dizzy", "HEAD"]

        }
    ],
    "bitbake" : [
        {
            "name": "master",
            "giturl": "git://git.openembedded.org/bitbake",
            "branch": "master",
            "dirpath": ""
        },
        {
            "name": "dizzy",
            "giturl": "git://git.openembedded.org/bitbake",
            "branch": "1.24",
            "dirpath": ""
        },
        {
            "name": "HEAD",
            "giturl": "git://git.openembedded.org/bitbake",
            "branch": "HEAD",
            "dirpath": ""
        }
    ],

    "defaultrelease": "master",

    "releases": [
        {
            "name": "master",
            "description": "OpenEmbedded master",
            "bitbake": "master",
            "branch": "master",
            "defaultlayers": [ "openembedded-core" ],
            "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" :  0 },
            "helptext": "Toaster will run your builds using the OpenEmbedded master branch, where active development takes place. This is not a stable branch, so your builds might not work as expected."
        },
        {
            "name": "dizzy",
            "description": "OpenEmbedded Dizzy",
            "bitbake": "dizzy",
            "branch": "dizzy",
            "defaultlayers": [ "openembedded-core" ],
            "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" :  0 },
            "helptext": "Toaster will run your builds with the OpenEmbedded Dizzy release"
        },
        {
            "name": "local",
            "description": "Local OpenEmbedded",
            "bitbake": "HEAD",
            "branch": "HEAD",
            "defaultlayers": [ "openembedded-core" ],
            "layersourcepriority": { "Imported layers": 99, "Local OpenEmbedded" : 10, "OpenEmbedded" :  0 },
            "helptext": "Toaster will run your builds with the version of OpenEmbedded that you have cloned or downloaded to your computer."
        }
    ]
}