Skip to contentSkip to conversation

package/tio: fix build with termio redefinition

PATCH New Vadym Kochan 2 participants 2 messages May 11, 2020 – May 15, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/tio: fix build with termio redefinition

Include termbits.h from asm-generic/ which does not have termio definition which is already defined by sys/ioctl.h -> ioctl-types.h

Same approach is also used by flashrom tool.

---
 ...01-setspeed2-fix-termio-redefinition.patch | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 package/tio/0001-setspeed2-fix-termio-redefinition.patch
package/tio/0001-setspeed2-fix-termio-redefinition.patch new file +30 -0
new file mode 100644
index 0000000000..89a555eceb
@@ -0,0 +1,30 @@
+From 02e13b011b9fee00cafaf3ed95cb04a414e0aa35 Mon Sep 17 00:00:00 2001
+From: Vadym Kochan <[email protected]>
+Date: Sun, 10 May 2020 01:49:30 +0300
+Subject: [PATCH] setspeed2: fix termio redefinition
+
+Include termbits.h from asm-generic which does not defines 'struct
+termio' which causes redefinition issue with already declared one from
+the sys/ioctl.h -> ioctl-types.h by glibc.
+
+Signed-off-by: Vadym Kochan <[email protected]>
+---
+ src/setspeed2.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/setspeed2.c b/src/setspeed2.c
+index 0adf695..f80f0c2 100644
+--- a/src/setspeed2.c
++++ b/src/setspeed2.c
+@@ -21,7 +21,7 @@
+ 
+ #include <sys/ioctl.h>
+ #include <asm/ioctls.h>
+-#include <asm/termbits.h>
++#include <asm-generic/termbits.h>
+ 
+ int setspeed2(int fd, int baudrate)
+ {
+-- 
+2.26.2
+
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/1 package/tio: fix build with termio redefinition

Quoted 8 lines · On Mon, 11 May 2020 17:26:02 +0300 Vadym Kochan <[email protected]> wrote:

Include termbits.h from asm-generic/ which does not have termio definition which is already defined by sys/ioctl.h -> ioctl-types.h

Same approach is also used by flashrom tool.

A similar change was already submitted upstream by Fabrice Fontaine:

https://github.com/tio/tio/pull/98/commits/7a84120f7bfbe698fa8050953b7a3e7a7dc63ca0

And it was submitted to Buildroot, and it was already rejected. Indeed, including <asm-generic/...> headers from user-space is bad.

See some discussion in the picocom source code at
https://github.com/npat-efault/picocom/blob/master/termbits2.h#L37 for more details about this issue.

Unfortunately, it doesn't seem like there is an easy fix available, short of replicating what picocom did.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com