diff options
-rw-r--r-- | meta/conf/distro/include/default-distrovars.inc | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/neard/neard/neard | 42 | ||||
-rw-r--r-- | meta/recipes-connectivity/neard/neard_0.9.bb | 57 | ||||
-rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-base.bb | 14 |
4 files changed, 114 insertions, 1 deletions
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 1169ca5b6f..f0fec2a011 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc | |||
@@ -18,7 +18,7 @@ DISTRO_FEATURES_LIBC_DEFAULT ?= "ipv4 ipv6 libc-backtrace libc-big-macros libc-b | |||
18 | DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}" | 18 | DISTRO_FEATURES_LIBC ?= "${DISTRO_FEATURES_LIBC_DEFAULT}" |
19 | DISTRO_FEATURES_LIBC_class-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}" | 19 | DISTRO_FEATURES_LIBC_class-nativesdk = "${DISTRO_FEATURES_LIBC_DEFAULT}" |
20 | DISTRO_FEATURES_INITMAN ?= "sysvinit" | 20 | DISTRO_FEATURES_INITMAN ?= "sysvinit" |
21 | DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g x11 ${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_INITMAN}" | 21 | DISTRO_FEATURES ?= "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 ${DISTRO_FEATURES_LIBC} ${DISTRO_FEATURES_INITMAN}" |
22 | 22 | ||
23 | IMAGE_FEATURES ?= "" | 23 | IMAGE_FEATURES ?= "" |
24 | 24 | ||
diff --git a/meta/recipes-connectivity/neard/neard/neard b/meta/recipes-connectivity/neard/neard/neard new file mode 100644 index 0000000000..5f36174d62 --- /dev/null +++ b/meta/recipes-connectivity/neard/neard/neard | |||
@@ -0,0 +1,42 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | DAEMON=/usr/sbin/neard | ||
4 | PIDFILE=/var/run/neard.pid | ||
5 | DESC="Linux NFC daemon" | ||
6 | |||
7 | if [ -f /etc/default/neard ] ; then | ||
8 | . /etc/default/neard | ||
9 | fi | ||
10 | |||
11 | set -e | ||
12 | |||
13 | do_start() { | ||
14 | $DAEMON | ||
15 | } | ||
16 | |||
17 | do_stop() { | ||
18 | start-stop-daemon --stop --name neard --quiet | ||
19 | } | ||
20 | |||
21 | case "$1" in | ||
22 | start) | ||
23 | echo "Starting $DESC" | ||
24 | do_start | ||
25 | ;; | ||
26 | stop) | ||
27 | echo "Stopping $DESC" | ||
28 | do_stop | ||
29 | ;; | ||
30 | restart|force-reload) | ||
31 | echo "Restarting $DESC" | ||
32 | do_stop | ||
33 | sleep 1 | ||
34 | do_start | ||
35 | ;; | ||
36 | *) | ||
37 | echo "Usage: $0 {start|stop|restart|force-reload}" >&2 | ||
38 | exit 1 | ||
39 | ;; | ||
40 | esac | ||
41 | |||
42 | exit 0 | ||
diff --git a/meta/recipes-connectivity/neard/neard_0.9.bb b/meta/recipes-connectivity/neard/neard_0.9.bb new file mode 100644 index 0000000000..61ea58cc14 --- /dev/null +++ b/meta/recipes-connectivity/neard/neard_0.9.bb | |||
@@ -0,0 +1,57 @@ | |||
1 | SUMMARY = "Linux NFC daemon" | ||
2 | DESCRIPTION = "A daemon for the Linux Near Field Communication stack" | ||
3 | HOMEPAGE = "http://01.org/linux-nfc" | ||
4 | |||
5 | LICENSE = "GPLv2" | ||
6 | |||
7 | DEPENDS = "dbus glib-2.0 libnl" | ||
8 | |||
9 | inherit autotools pkgconfig update-rc.d | ||
10 | |||
11 | INITSCRIPT_NAME = "neard" | ||
12 | INITSCRIPT_PARAMS = "defaults 64" | ||
13 | |||
14 | # This would copy neard start-stop shell and test scripts | ||
15 | do_install_append() { | ||
16 | install -d ${D}${sysconfdir}/init.d/ | ||
17 | install -m 0755 ${WORKDIR}/neard ${D}${sysconfdir}/init.d/neard | ||
18 | |||
19 | install -d ${D}${libdir}/neard | ||
20 | install -m 0755 ${S}/test/* ${D}${libdir}/neard/ | ||
21 | install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/neard/ | ||
22 | } | ||
23 | |||
24 | RDEPENDS_${PN} = "dbus python python-dbus python-pygobject" | ||
25 | |||
26 | # Bluez & Wifi are not mandatory except for handover " | ||
27 | RRECOMMENDS_${PN} = "\ | ||
28 | ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ | ||
29 | ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ | ||
30 | " | ||
31 | |||
32 | #Additional | ||
33 | PACKAGES =+ "${PN}-tests" | ||
34 | |||
35 | FILES_${PN}-tests = "${libdir}/neard/*-test" | ||
36 | RDEPENDS_${PN}-tests = "python python-dbus python-pygobject" | ||
37 | |||
38 | FILES_${PN}-dbg += "${bindir}/neard/*/.debug" | ||
39 | |||
40 | ##============================= | ||
41 | # This is valid for 0.9+ | ||
42 | LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ | ||
43 | file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ | ||
44 | " | ||
45 | S = "${WORKDIR}/git" | ||
46 | SRCREV = "7abdb13d106d496e1115fab49e6448a249dfb3c8" | ||
47 | PV = "0.9-git${SRCPV}" | ||
48 | PR = "r1" | ||
49 | |||
50 | SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=git \ | ||
51 | file://neard \ | ||
52 | " | ||
53 | |||
54 | EXTRA_OECONF += "--enable-tools \ | ||
55 | " | ||
56 | |||
57 | |||
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 100cc88be3..799e12a7ac 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb | |||
@@ -28,6 +28,7 @@ PACKAGES = ' \ | |||
28 | ${@base_contains("DISTRO_FEATURES", "bluetooth", "packagegroup-base-bluetooth", "", d)} \ | 28 | ${@base_contains("DISTRO_FEATURES", "bluetooth", "packagegroup-base-bluetooth", "", d)} \ |
29 | ${@base_contains("DISTRO_FEATURES", "wifi", "packagegroup-base-wifi", "", d)} \ | 29 | ${@base_contains("DISTRO_FEATURES", "wifi", "packagegroup-base-wifi", "", d)} \ |
30 | ${@base_contains("DISTRO_FEATURES", "3g", "packagegroup-base-3g", "", d)} \ | 30 | ${@base_contains("DISTRO_FEATURES", "3g", "packagegroup-base-3g", "", d)} \ |
31 | ${@base_contains("DISTRO_FEATURES", "nfc", "packagegroup-base-nfc", "", d)} \ | ||
31 | ${@base_contains("DISTRO_FEATURES", "cramfs", "packagegroup-base-cramfs", "", d)} \ | 32 | ${@base_contains("DISTRO_FEATURES", "cramfs", "packagegroup-base-cramfs", "", d)} \ |
32 | ${@base_contains("DISTRO_FEATURES", "ipsec", "packagegroup-base-ipsec", "", d)} \ | 33 | ${@base_contains("DISTRO_FEATURES", "ipsec", "packagegroup-base-ipsec", "", d)} \ |
33 | ${@base_contains("DISTRO_FEATURES", "ipv6", "packagegroup-base-ipv6", "", d)} \ | 34 | ${@base_contains("DISTRO_FEATURES", "ipv6", "packagegroup-base-ipv6", "", d)} \ |
@@ -71,6 +72,7 @@ RDEPENDS_packagegroup-base = "\ | |||
71 | ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'packagegroup-base-bluetooth', '',d)} \ | 72 | ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'packagegroup-base-bluetooth', '',d)} \ |
72 | ${@base_contains('COMBINED_FEATURES', 'wifi', 'packagegroup-base-wifi', '',d)} \ | 73 | ${@base_contains('COMBINED_FEATURES', 'wifi', 'packagegroup-base-wifi', '',d)} \ |
73 | ${@base_contains('COMBINED_FEATURES', '3g', 'packagegroup-base-3g', '',d)} \ | 74 | ${@base_contains('COMBINED_FEATURES', '3g', 'packagegroup-base-3g', '',d)} \ |
75 | ${@base_contains('COMBINED_FEATURES', 'nfc', 'packagegroup-base-nfc', '',d)} \ | ||
74 | \ | 76 | \ |
75 | ${@base_contains('DISTRO_FEATURES', 'nfs', 'packagegroup-base-nfs', '',d)} \ | 77 | ${@base_contains('DISTRO_FEATURES', 'nfs', 'packagegroup-base-nfs', '',d)} \ |
76 | ${@base_contains('DISTRO_FEATURES', 'cramfs', 'packagegroup-base-cramfs', '',d)} \ | 78 | ${@base_contains('DISTRO_FEATURES', 'cramfs', 'packagegroup-base-cramfs', '',d)} \ |
@@ -96,11 +98,13 @@ RDEPENDS_packagegroup-base-extended = "\ | |||
96 | ${ADD_WIFI} \ | 98 | ${ADD_WIFI} \ |
97 | ${ADD_BT} \ | 99 | ${ADD_BT} \ |
98 | ${ADD_3G} \ | 100 | ${ADD_3G} \ |
101 | ${ADD_NFC} \ | ||
99 | " | 102 | " |
100 | 103 | ||
101 | ADD_WIFI = "" | 104 | ADD_WIFI = "" |
102 | ADD_BT = "" | 105 | ADD_BT = "" |
103 | ADD_3G = "" | 106 | ADD_3G = "" |
107 | ADD_NFC = "" | ||
104 | 108 | ||
105 | python __anonymous () { | 109 | python __anonymous () { |
106 | # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them) | 110 | # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them) |
@@ -118,6 +122,9 @@ python __anonymous () { | |||
118 | if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): | 122 | if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features): |
119 | d.setVar("ADD_3G", "packagegroup-base-3g") | 123 | d.setVar("ADD_3G", "packagegroup-base-3g") |
120 | 124 | ||
125 | if "nfc" in distro_features and not "nfc" in machine_features and ("usbhost" in machine_features): | ||
126 | d.setVar("ADD_NFC", "packagegroup-base-nfc") | ||
127 | |||
121 | # For backwards compatibility after rename | 128 | # For backwards compatibility after rename |
122 | packages = d.getVar("PACKAGES", True).split() | 129 | packages = d.getVar("PACKAGES", True).split() |
123 | for pkg in packages: | 130 | for pkg in packages: |
@@ -309,6 +316,13 @@ RRECOMMENDS_packagegroup-base-wifi = "\ | |||
309 | kernel-module-aes-generic \ | 316 | kernel-module-aes-generic \ |
310 | kernel-module-aes" | 317 | kernel-module-aes" |
311 | 318 | ||
319 | SUMMARY_packagegroup-base-nfc = "Near Field Communication support" | ||
320 | RDEPENDS_packagegroup-base-nfc = "\ | ||
321 | neard" | ||
322 | |||
323 | RRECOMMENDS_packagegroup-base-nfc = "\ | ||
324 | kernel-module-nfc" | ||
325 | |||
312 | SUMMARY_packagegroup-base-3g = "Cellular data support" | 326 | SUMMARY_packagegroup-base-3g = "Cellular data support" |
313 | RDEPENDS_packagegroup-base-3g = "\ | 327 | RDEPENDS_packagegroup-base-3g = "\ |
314 | ofono" | 328 | ofono" |