From 9045e21b7f60b5565fad8b0e540478a4abce941d Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Thu, 7 Jul 2016 18:13:03 +0300 Subject: neard: upgrade to 0.16 0.15 -> 0.16 (From OE-Core rev: a6c88ff6c22a832762d3357967e885064feb577b) Signed-off-by: Maxin B. John Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-connectivity/neard/neard_0.15.bb | 49 --------------------------- meta/recipes-connectivity/neard/neard_0.16.bb | 49 +++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 meta/recipes-connectivity/neard/neard_0.15.bb create mode 100644 meta/recipes-connectivity/neard/neard_0.16.bb (limited to 'meta/recipes-connectivity/neard') diff --git a/meta/recipes-connectivity/neard/neard_0.15.bb b/meta/recipes-connectivity/neard/neard_0.15.bb deleted file mode 100644 index 065cbec931..0000000000 --- a/meta/recipes-connectivity/neard/neard_0.15.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "Linux NFC daemon" -DESCRIPTION = "A daemon for the Linux Near Field Communication stack" -HOMEPAGE = "http://01.org/linux-nfc" -LICENSE = "GPLv2" - -DEPENDS = "dbus glib-2.0 libnl" - -SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \ - file://neard.in \ - file://Makefile.am-fix-parallel-issue.patch \ - file://Makefile.am-do-not-ship-version.h.patch \ - " -SRC_URI[md5sum] = "b746ce62eeef88e8de90765e00a75a1c" -SRC_URI[sha256sum] = "651f6513d32cdaf8a426255d03aff38a6620a89b0567ec2b36606c6330a93353" - -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ - file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ - " - -inherit autotools pkgconfig systemd update-rc.d bluetooth - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" - -PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd" - -EXTRA_OECONF += "--enable-tools" - -# This would copy neard start-stop shell and test scripts -do_install_append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}${sysconfdir}/init.d/ - sed "s:@installpath@:${libexecdir}/nfc:" ${WORKDIR}/neard.in \ - > ${D}${sysconfdir}/init.d/neard - chmod 0755 ${D}${sysconfdir}/init.d/neard - fi -} - -RDEPENDS_${PN} = "dbus" - -# Bluez & Wifi are not mandatory except for handover -RRECOMMENDS_${PN} = "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ - " - -INITSCRIPT_NAME = "neard" -INITSCRIPT_PARAMS = "defaults 64" - -SYSTEMD_SERVICE_${PN} = "neard.service" diff --git a/meta/recipes-connectivity/neard/neard_0.16.bb b/meta/recipes-connectivity/neard/neard_0.16.bb new file mode 100644 index 0000000000..5433dc3c3e --- /dev/null +++ b/meta/recipes-connectivity/neard/neard_0.16.bb @@ -0,0 +1,49 @@ +SUMMARY = "Linux NFC daemon" +DESCRIPTION = "A daemon for the Linux Near Field Communication stack" +HOMEPAGE = "http://01.org/linux-nfc" +LICENSE = "GPLv2" + +DEPENDS = "dbus glib-2.0 libnl" + +SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \ + file://neard.in \ + file://Makefile.am-fix-parallel-issue.patch \ + file://Makefile.am-do-not-ship-version.h.patch \ + " +SRC_URI[md5sum] = "5c691fb7872856dc0d909c298bc8cb41" +SRC_URI[sha256sum] = "eae3b11c541a988ec11ca94b7deab01080cd5b58cfef3ced6ceac9b6e6e65b36" + +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ + file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ + " + +inherit autotools pkgconfig systemd update-rc.d bluetooth + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" + +PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-systemduserunitdir=${systemd_unitdir}/user/,--disable-systemd" + +EXTRA_OECONF += "--enable-tools" + +# This would copy neard start-stop shell and test scripts +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/init.d/ + sed "s:@installpath@:${libexecdir}/nfc:" ${WORKDIR}/neard.in \ + > ${D}${sysconfdir}/init.d/neard + chmod 0755 ${D}${sysconfdir}/init.d/neard + fi +} + +RDEPENDS_${PN} = "dbus" + +# Bluez & Wifi are not mandatory except for handover +RRECOMMENDS_${PN} = "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ + " + +INITSCRIPT_NAME = "neard" +INITSCRIPT_PARAMS = "defaults 64" + +SYSTEMD_SERVICE_${PN} = "neard.service" -- cgit v1.2.3-54-g00ecf