From e22020741a655d0fa5d78b22a9efb8994a6ca1a3 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 12 Jan 2015 18:55:19 -0800 Subject: neard: fix B != S And bump PR to avoid: configure: error: source directory already configured; run "make distclean" there first (From OE-Core rev: 26937169a0cb04e71ddd79bae3bca6feb22fc369) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-connectivity/neard/neard.inc | 4 ++-- meta/recipes-connectivity/neard/neard_0.14.bb | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'meta/recipes-connectivity/neard') diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc index e714cadc2b..76640d8a1a 100644 --- a/meta/recipes-connectivity/neard/neard.inc +++ b/meta/recipes-connectivity/neard/neard.inc @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ " -inherit autotools-brokensep pkgconfig systemd update-rc.d +inherit autotools pkgconfig systemd update-rc.d EXTRA_OECONF += "--enable-tools" @@ -35,7 +35,7 @@ do_install_append() { # Install the tests for neard-tests install -d ${D}${libdir}/neard install -m 0755 ${S}/test/* ${D}${libdir}/${BPN}/ - install -m 0755 ${S}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/ + install -m 0755 ${B}/tools/nfctool/nfctool ${D}${libdir}/${BPN}/ } PACKAGES =+ "${PN}-tests" diff --git a/meta/recipes-connectivity/neard/neard_0.14.bb b/meta/recipes-connectivity/neard/neard_0.14.bb index 2fb47cc3d7..7a1096bf4e 100644 --- a/meta/recipes-connectivity/neard/neard_0.14.bb +++ b/meta/recipes-connectivity/neard/neard_0.14.bb @@ -9,3 +9,4 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BPN}-${PV}.tar.xz \ SRC_URI[md5sum] = "692ba2653d60155255244c87396c486b" SRC_URI[sha256sum] = "6ea724b443d39d679168fc7776a965d1f64727c3735391df2c01469ee7cd8cca" +PR = "r1" -- cgit v1.2.3-54-g00ecf