Skip to contentSkip to conversation

libopie2: update DEPENDS to properly select bluez5 or bluez4

PATCH New Dmitry Eremin-Solenikov 1 participant 3 messages May 11, 2015

lore
Share & tools
lore

Dmitry Eremin-Solenikov

author
#0 lore raw

PATCH 1/3 libopie2: update DEPENDS to properly select bluez5 or bluez4

Signed-off-by Dmitry Eremin-Solenikov <[email protected]>
---
 recipes-opie/libopie/libopie2.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
recipes-opie/libopie/libopie2.inc +2 -1
index 955cd60..38d04aa 100644
@@ -5,7 +5,8 @@ LICENSE = "LGPLv2"
 # FIXME stopgap until split archives have license files included
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/LGPL-2.0;md5=9427b8ccf5cf3df47c29110424c9641a"
 I18N_FILES = "libopiecore2.ts libopiesecurity2.ts"
-DEPENDS = "libqpe-opie libpcap sqlite3 bluez4"
+DEPENDS = "libqpe-opie libpcap sqlite3"
+DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}"
 PROVIDES = "libopiecore2 libopiedb2 libopiemm2 libopiesecurity2 libopienet2 libopiepim2 libopieui2"
 
 INC_PR = "r17"
Signature · 1 line
2.1.4
author
#1 lore raw

PATCH 2/3 opexpush: update DEPENDS to properly select bluez5 or bluez4

Signed-off-by Dmitry Eremin-Solenikov <[email protected]>
---
 recipes-support/obexpush/obexpush_1.0.0.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
recipes-support/obexpush/obexpush_1.0.0.bb +2 -1
index 57ba5db..5018728 100644
@@ -2,7 +2,8 @@ DESCRIPTION = "Obex Push Utilities"
 HOMEPAGE = "http://www.caside.lancs.ac.uk/java_bt.php"
 SECTION = "console/network"
 LICENSE = "GPLv2+"
-DEPENDS = "glib-2.0 openobex bluez4"
+DEPENDS = "glib-2.0 openobex"
+DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','bluez5','bluez5','bluez4',d)}"
 PR = "r7"
 
 SRC_URI = "http://www.caside.lancs.ac.uk/bt/obexpush.tar.gz \
Signature · 1 line
2.1.4
author
#2 lore raw

PATCH 3/3 obexpush: fix compilation error

In reply to Dmitry Eremin-Solenikov

Newer glibc is strict on passing mode argument to open() call if O_CREAT has been specified. Provide reasonable mode argument to fix compilation error.

Signed-off-by Dmitry Eremin-Solenikov <[email protected]>
---
 recipes-support/obexpush/files/fix-open.patch | 18 ++++++++++++++++++
 recipes-support/obexpush/obexpush_1.0.0.bb    |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 recipes-support/obexpush/files/fix-open.patch
recipes-support/obexpush/files/fix-open.patch new file +18 -0
new file mode 100644
index 0000000..1280daf
@@ -0,0 +1,18 @@
+Index: obexpush/opd/main.c
+===================================================================
+--- obexpush.orig/opd/main.c
++++ obexpush/opd/main.c
+@@ -562,11 +562,11 @@ int main(int argc, char **argv,char *env
+ 			dup2(fd, 0);
+ 			close(fd);
+ 
+-			fd = open("_opd_msgs.txt", O_RDWR | O_CREAT);
++			fd = open("_opd_msgs.txt", O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
+ 			dup2(fd, 1);
+ 			close(fd);
+ 
+-			fd = open("_opd_errs.txt", O_RDWR | O_CREAT);
++			fd = open("_opd_errs.txt", O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
+ 			dup2(fd, 2);
+ 			close(fd);
+
recipes-support/obexpush/obexpush_1.0.0.bb +1 -0
index 5018728..0cb18cd 100644
@@ -8,6 +8,7 @@ PR = "r7"
 
 SRC_URI = "http://www.caside.lancs.ac.uk/bt/obexpush.tar.gz \
            file://add-obextool.patch \
+           file://fix-open.patch \
            file://init \
            file://opd_args"
 S = "${WORKDIR}/obexpush"
Signature · 1 line
2.1.4