[meta-opie][PATCH] opie-bluetoothd: fix compilation issues

[meta-opie][PATCH] opie-bluetoothd: fix compilation issues

[Dmitry Eremin-Solenikov]

rfkill.cpp uses symbols from libsysfs. However opie-bluetoothd recipe
lacks dependency on sysfsutils (package containing libsysfs) and project
file also lacks -lsysfs in the LIBS rule. Fix those issues.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 recipes-opie/opie-bluetoothd/opie-bluetoothd.inc   |    1 +
 .../opie-bluetoothd/opie-bluetoothd/libsysfs.patch |   20 ++++++++++++++++++++
 .../opie-bluetoothd/opie-bluetoothd_git.bb         |    5 ++++-
 3 files changed, 25 insertions(+), 1 deletions(-)
 create mode 100644 recipes-opie/opie-bluetoothd/opie-bluetoothd/libsysfs.patch

diff --git a/recipes-opie/opie-bluetoothd/opie-bluetoothd.inc b/recipes-opie/opie-bluetoothd/opie-bluetoothd.inc
index 5cae5be..6c8f6a5 100644
--- a/recipes-opie/opie-bluetoothd/opie-bluetoothd.inc
+++ b/recipes-opie/opie-bluetoothd/opie-bluetoothd.inc
@@ -4,6 +4,7 @@ LICENSE = "GPLv2"
 # FIXME stopgap until split archives have license files included
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 APPNAME = "opiebluetoothd"
+DEPENDS = "sysfsutils"
 
 S = "${WORKDIR}/opiebluetoothd"
 
diff --git a/recipes-opie/opie-bluetoothd/opie-bluetoothd/libsysfs.patch b/recipes-opie/opie-bluetoothd/opie-bluetoothd/libsysfs.patch
new file mode 100644
index 0000000..0701e22
--- /dev/null
+++ b/recipes-opie/opie-bluetoothd/opie-bluetoothd/libsysfs.patch
@@ -0,0 +1,20 @@
+Upstream-Status: Pending
+Subject: Fix opiebluetoothd linking to libsysfs
+
+rfkill.cpp uses symbols from libsys. Add -lsysfs to the LIBS list
+
+Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+
+Index: opiebluetoothd/opiebluetoothd.pro
+===================================================================
+--- opiebluetoothd.orig/opiebluetoothd.pro	2011-12-13 23:52:42.563082969 +0400
++++ opiebluetoothd/opiebluetoothd.pro	2011-12-14 01:10:28.375070146 +0400
+@@ -5,7 +5,7 @@
+ INTERFACES      = bluetoothpindlgbase.ui
+ INCLUDEPATH     += $(OPIEDIR)/include
+ DEPENDPATH      += $(OPIEDIR)/include
+-LIBS            += -lqpe -lopiecore2 -lopiebluez2 -lopieui2 -ldbus-qt2 $$system(pkg-config --libs dbus-1)
++LIBS            += -lqpe -lopiecore2 -lopiebluez2 -lopieui2 -ldbus-qt2 $$system(pkg-config --libs dbus-1) -lsysfs
+ 
+ TARGET 		= opiebluetoothd
+ 
diff --git a/recipes-opie/opie-bluetoothd/opie-bluetoothd_git.bb b/recipes-opie/opie-bluetoothd/opie-bluetoothd_git.bb
index dac89e4..a9d29f3 100644
--- a/recipes-opie/opie-bluetoothd/opie-bluetoothd_git.bb
+++ b/recipes-opie/opie-bluetoothd/opie-bluetoothd_git.bb
@@ -1,4 +1,7 @@
 require ${PN}.inc
 PV = "${OPIE_GIT_PV}"
 
-SRC_URI = "${OPIE_GIT};protocol=git;subpath=noncore/net/opietooth/opiebluetoothd"
+SRC_URI = "\
+    ${OPIE_GIT};protocol=git;subpath=noncore/net/opietooth/opiebluetoothd \
+    file://libsysfs.patch \
+"
-- 
1.7.7.3

Re: [meta-opie][PATCH] opie-bluetoothd: fix compilation issues

[Paul Eggleton]

On Wednesday 14 December 2011 01:25:50 Dmitry Eremin-Solenikov wrote:
> rfkill.cpp uses symbols from libsysfs. However opie-bluetoothd recipe
> lacks dependency on sysfsutils (package containing libsysfs) and project
> file also lacks -lsysfs in the LIBS rule. Fix those issues.

Rather than apply this patch I've merged the change upstream and updated the 
OPIE_SRCREV in meta-opie to f5c8bd6272b5bee393736f401232ce0ccc984fec (which 
includes a few other fixes as well.) Thanks!

As an aside, I'm contemplating removing the libsysfs-dependent code in favour 
of accessing the files directly, since that's what the current kernel sysfs 
documentation recommends.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre

Re: [meta-opie][PATCH] opie-bluetoothd: fix compilation issues

[Dmitry Eremin-Solenikov]

On Wed, Dec 14, 2011 at 2:58 AM, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
> On Wednesday 14 December 2011 01:25:50 Dmitry Eremin-Solenikov wrote:
>> rfkill.cpp uses symbols from libsysfs. However opie-bluetoothd recipe
>> lacks dependency on sysfsutils (package containing libsysfs) and project
>> file also lacks -lsysfs in the LIBS rule. Fix those issues.
>
> Rather than apply this patch I've merged the change upstream and updated the
> OPIE_SRCREV in meta-opie to f5c8bd6272b5bee393736f401232ce0ccc984fec (which
> includes a few other fixes as well.) Thanks!

Thanks! I just didn't want to touch SRCREV, so I provided oe patch instead :)

-- 
With best wishes
Dmitry

Re: [meta-opie][PATCH] opie-bluetoothd: fix compilation issues

[Paul Eggleton]

On Wednesday 14 December 2011 03:32:08 Dmitry Eremin-Solenikov wrote:
> <paul.eggleton@linux.intel.com> wrote:
> > On Wednesday 14 December 2011 01:25:50 Dmitry Eremin-Solenikov wrote:
> >> rfkill.cpp uses symbols from libsysfs. However opie-bluetoothd recipe
> >> lacks dependency on sysfsutils (package containing libsysfs) and
> >> project
> >> file also lacks -lsysfs in the LIBS rule. Fix those issues.
> > 
> > Rather than apply this patch I've merged the change upstream and updated
> > the OPIE_SRCREV in meta-opie to
> > f5c8bd6272b5bee393736f401232ce0ccc984fec (which includes a few other
> > fixes as well.) Thanks!
> 
> Thanks! I just didn't want to touch SRCREV, so I provided oe patch instead
> :)

I guess I prefer updating SRCREV to carrying around a bunch of patches given 
that I'm the upstream in this case ;) I realise it forces a rebuild of 
everything, but I'd imagine people building from git are prepared to put up 
with a little pain for the benefit of getting the absolute latest code.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre