opie-bluetoothd: fix compilation issues
PATCH 1/1 opie-bluetoothd: fix compilation issues
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.
--- 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
recipes-opie/opie-bluetoothd/opie-bluetoothd.inc +1 -0
@@ -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"
recipes-opie/opie-bluetoothd/opie-bluetoothd/libsysfs.patch new file +20 -0
@@ -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 <[email protected]> + +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 +
recipes-opie/opie-bluetoothd/opie-bluetoothd_git.bb +4 -1
@@ -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 \ +"
Signature · 1 line
1.7.7.3
Quoted 3 lines · 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
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre
Quoted 8 lines · Paul Eggleton
Quoted 3 lines · 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_SRCREVin meta-opie tof5c8bd6272b5bee393736f401232ce0ccc984fec(which includes a few other fixes as well.) Thanks!
Thanks! I just didn't want to touch SRCREV, so I provided oe patch instead :)
Signature · 2 lines
With best wishes Dmitry
Quoted 7 lines · On Wednesday 14 December 2011 03:32:08 Dmitry Eremin-Solenikov wrote:
Quoted 6 lines · <[email protected]> wrote:
Quoted 4 lines · 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.
Quoted 7 lines
Quoted 4 lines
Rather than apply this patch I've merged the change upstream and updated the
OPIE_SRCREVin meta-opie tof5c8bd6272b5bee393736f401232ce0ccc984fec(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
Signature · 2 lines
Paul Eggleton Intel Open Source Technology Centre