diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-04-29 12:57:14 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-29 14:47:46 +0100 |
| commit | 354287932e3cbcaee3044af2ccd34027afc9b1df (patch) | |
| tree | a598f7dab45fc2cb6b93d158c79a2a701361cc59 | |
| parent | eb9e50d51497691f4ceb85f400fda549a62b2c02 (diff) | |
| download | poky-354287932e3cbcaee3044af2ccd34027afc9b1df.tar.gz | |
neard: re-order recipe so the statement order is logical
(From OE-Core rev: 373dc2778f263baa7958c48cc1644008e2a40676)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-connectivity/neard/neard_0.9.bb | 54 |
1 files changed, 25 insertions, 29 deletions
diff --git a/meta/recipes-connectivity/neard/neard_0.9.bb b/meta/recipes-connectivity/neard/neard_0.9.bb index d598666c56..2c4acb3ebf 100644 --- a/meta/recipes-connectivity/neard/neard_0.9.bb +++ b/meta/recipes-connectivity/neard/neard_0.9.bb | |||
| @@ -1,15 +1,26 @@ | |||
| 1 | SUMMARY = "Linux NFC daemon" | 1 | SUMMARY = "Linux NFC daemon" |
| 2 | DESCRIPTION = "A daemon for the Linux Near Field Communication stack" | 2 | DESCRIPTION = "A daemon for the Linux Near Field Communication stack" |
| 3 | HOMEPAGE = "http://01.org/linux-nfc" | 3 | HOMEPAGE = "http://01.org/linux-nfc" |
| 4 | LICENSE = "GPLv2" | ||
| 4 | 5 | ||
| 5 | LICENSE = "GPLv2" | 6 | DEPENDS = "dbus glib-2.0 libnl" |
| 6 | 7 | ||
| 7 | DEPENDS = "dbus glib-2.0 libnl" | 8 | SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=git \ |
| 9 | file://neard.in \ | ||
| 10 | " | ||
| 11 | |||
| 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ | ||
| 13 | file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ | ||
| 14 | " | ||
| 15 | |||
| 16 | S = "${WORKDIR}/git" | ||
| 17 | SRCREV = "eb486bf35e24d7d1db61350f5ab393a0c880523d" | ||
| 18 | PV = "0.10+git${SRCPV}" | ||
| 19 | PR = "r0" | ||
| 8 | 20 | ||
| 9 | inherit autotools pkgconfig update-rc.d | 21 | inherit autotools pkgconfig update-rc.d |
| 10 | 22 | ||
| 11 | INITSCRIPT_NAME = "neard" | 23 | EXTRA_OECONF += "--enable-tools" |
| 12 | INITSCRIPT_PARAMS = "defaults 64" | ||
| 13 | 24 | ||
| 14 | do_install() { | 25 | do_install() { |
| 15 | oe_runmake DESTDIR=${D} libexecdir=${libexecdir} install | 26 | oe_runmake DESTDIR=${D} libexecdir=${libexecdir} install |
| @@ -31,35 +42,20 @@ do_install_append() { | |||
| 31 | install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/ | 42 | install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/ |
| 32 | } | 43 | } |
| 33 | 44 | ||
| 34 | RDEPENDS_${PN} = "dbus python python-dbus python-pygobject" | ||
| 35 | |||
| 36 | # Bluez & Wifi are not mandatory except for handover " | ||
| 37 | RRECOMMENDS_${PN} = "\ | ||
| 38 | ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ | ||
| 39 | ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ | ||
| 40 | " | ||
| 41 | |||
| 42 | #Additional | ||
| 43 | PACKAGES =+ "${PN}-tests" | 45 | PACKAGES =+ "${PN}-tests" |
| 44 | 46 | ||
| 45 | FILES_${PN}-tests = "${libdir}/${BPN}/*-test" | 47 | FILES_${PN}-tests = "${libdir}/${BPN}/*-test" |
| 46 | FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug" | 48 | FILES_${PN}-dbg += "${libdir}/${BPN}/*/.debug" |
| 47 | 49 | ||
| 48 | RDEPENDS_${PN}-tests = "python python-dbus python-pygobject" | 50 | RDEPENDS_${PN} = "dbus python python-dbus python-pygobject" |
| 49 | |||
| 50 | # This is valid for 0.10+ | ||
| 51 | LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ | ||
| 52 | file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ | ||
| 53 | " | ||
| 54 | S = "${WORKDIR}/git" | ||
| 55 | SRCREV = "eb486bf35e24d7d1db61350f5ab393a0c880523d" | ||
| 56 | PV = "0.10+git${SRCPV}" | ||
| 57 | PR = "r0" | ||
| 58 | 51 | ||
| 59 | SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=git \ | 52 | # Bluez & Wifi are not mandatory except for handover |
| 60 | file://neard.in \ | 53 | RRECOMMENDS_${PN} = "\ |
| 61 | " | 54 | ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ |
| 55 | ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ | ||
| 56 | " | ||
| 62 | 57 | ||
| 63 | EXTRA_OECONF += "--enable-tools \ | 58 | RDEPENDS_${PN}-tests = "python python-dbus python-pygobject" |
| 64 | " | ||
| 65 | 59 | ||
| 60 | INITSCRIPT_NAME = "neard" | ||
| 61 | INITSCRIPT_PARAMS = "defaults 64" | ||
