Skip to contentSkip to conversation

Revert "libiio: Disable IIOD on Blackfin"

PATCH New Samuel Martin 2 participants 3 messages Nov 3, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Revert "libiio: Disable IIOD on Blackfin"

This reverts commit 53996bee433f09a91b12aa53b2be0f7d22c0acbe.

Commit 93a86b4dec9e73fbe0e186cdde8fb04a36a44762 fixes accept4 support in uclibc on Blackfin, so re-enable iiod on this target.

---
 package/libiio/Config.in | 5 -----
 1 file changed, 5 deletions(-)
package/libiio/Config.in +0 -5
index baa163126a..b58ac7fdb3 100644
@@ -53,7 +53,6 @@ config BR2_PACKAGE_LIBIIO_IIOD
 	bool "IIO Daemon"
 	default y
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on !BR2_bfin
 	select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND
 	help
 	  Install the IIO Daemon.
@@ -74,10 +73,6 @@ comment "USB support in the IIO Daemon requires libaio, headers >= 3.18"
 
 comment "IIO Daemon needs a toolchain w/ threads"
 	depends on !BR2_TOOLCHAIN_HAS_THREADS
-	depends on !BR2_bfin
-
-comment "IIO Daemon is not yet available on Blackfin"
-	depends on BR2_bfin
 
 config BR2_PACKAGE_LIBIIO_TESTS
 	bool "Install test programs"
Signature · 1 line
2.15.0
#1 lore raw

PATCH 2/2 package/ussp-push: add patches fixing the build

Fixes:
http://autobuild.buildroot.net/results/bdd932424a45399836f27c435d6f1f6fb8b97c29
http://autobuild.buildroot.net/results/287b7d35d64d72cbc587192cce1271bda9647608
http://autobuild.buildroot.net/results/82e1484d9a43df7387137a1bd679a4d74d460a79

---
 .../0002-fix-build-again-obex-bluez.patch          | 28 +++++++++++++
 .../ussp-push/0003-add-OBEX_CharToUnicode.patch    | 47 ++++++++++++++++++++++
 2 files changed, 75 insertions(+)
 create mode 100644 package/ussp-push/0002-fix-build-again-obex-bluez.patch
 create mode 100644 package/ussp-push/0003-add-OBEX_CharToUnicode.patch
package/ussp-push/0002-fix-build-again-obex-bluez.patch new file +28 -0
new file mode 100644
index 0000000000..e98fe6ef13
@@ -0,0 +1,28 @@
+From 2d732026044d8e6cd16465ee87a73ac9692c021b Mon Sep 17 00:00:00 2001
+From: Samuel Martin <[email protected]>
+Date: Fri, 3 Nov 2017 09:04:12 +0100
+Subject: [PATCH] fix build again obex/bluez
+
+[fetch from debian source: http://http.debian.net/debian/pool/main/u/ussp-push/ussp-push_0.11-4.debian.tar.xz]
+
+Signed-off-by: Samuel Martin <[email protected]>
+---
+ src/obex_main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/obex_main.c b/src/obex_main.c
+index a7126e6..6233d7e 100644
+--- a/src/obex_main.c
++++ b/src/obex_main.c
+@@ -197,7 +197,7 @@ obex_t *__obex_connect(int devid, void *addr, int timeout, int *err)
+ 		*err = -1;
+ 		return NULL;
+ 	}
+-	if (!(handle = OBEX_Init(OBEX_TRANS_CUST, obex_event, 0))) {
++	if (!(handle = OBEX_Init(OBEX_TRANS_CUSTOM, obex_event, 0))) {
+ 		BTERROR("OBEX_Init failed: %s\n", strerror(errno));
+ 		obex_free(gt);
+ 		*err = -1;
+-- 
+2.15.0
+
package/ussp-push/0003-add-OBEX_CharToUnicode.patch new file +47 -0

47 lines not on this page · raw message

Signature · 1 line
2.15.0
#2 lore raw

PATCH 1/2 Revert "libiio: Disable IIOD on Blackfin"

In reply to Samuel Martin

Hello,

Quoted 10 lines · Samuel Martin

This reverts commit 53996bee433f09a91b12aa53b2be0f7d22c0acbe.

Commit 93a86b4dec9e73fbe0e186cdde8fb04a36a44762 fixes accept4 support in uclibc on Blackfin, so re-enable iiod on this target.

---
 package/libiio/Config.in | 5 -----
 1 file changed, 5 deletions(-)

Both patches applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com