Skip to contentSkip to conversation

python3: fix termios build for xtensa

PATCH New Baruch Siach 2 participants 3 messages Aug 6, 2014

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/2 python3: fix termios build for xtensa

Forward port the patch from c821210b1bfa (python: fix termios build for xtensa) to python3.

Fixes:
http://autobuild.buildroot.net/results/e7f/e7f71fbcb0796f315052947382fa39d85c5dc8fe/

Signed-off-by Baruch Siach <[email protected]>
---
 .../python3-014-serial-ioctl-workaround.patch      | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 package/python3/python3-014-serial-ioctl-workaround.patch
package/python3/python3-014-serial-ioctl-workaround.patch new file +23 -0
new file mode 100644
index 000000000000..9786d0354e91
@@ -0,0 +1,23 @@
+Serial ioctl() workaround
+
+The ioctls.h of some architectures (notably xtensa) references structs from
+linux/serial.h. Make sure to include this header as well.
+
+Also, undef TIOCTTYGSTRUCT that require reference to internal kernel tty_struct,
+but isn't actually referenced in modern kernels.
+
+Signed-off-by: Baruch Siach <[email protected]>
+---
+diff -Nuar Python-3.4.1-orig/Modules/termios.c Python-3.4.1/Modules/termios.c
+--- Python-3.4.1-orig/Modules/termios.c	2014-05-19 08:19:39.000000000 +0300
++++ Python-3.4.1/Modules/termios.c	2014-08-06 21:16:11.892362933 +0300
+@@ -9,7 +9,9 @@
+ #endif
+ 
+ #include <termios.h>
++#include <linux/serial.h>
+ #include <sys/ioctl.h>
++#undef TIOCTTYGSTRUCT
+ 
+ /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR,
+  * MDTR, MRI, and MRTS (appearantly used internally by some things
Signature · 1 line
2.0.1
author
#1 lore raw

PATCH 2/2 python: renumber patch

Advance the serial number of a patch from 015 to 016 to avoid collision and confusion.

Signed-off-by Baruch Siach <[email protected]>
---
 ...al-ioctl-workaround.patch => python-016-serial-ioctl-workaround.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/python/{python-015-serial-ioctl-workaround.patch => python-016-serial-ioctl-workaround.patch} (100%)
package/python/python-016-serial-ioctl-workaround.patch renamed from package/python/python-015-serial-ioctl-workaround.patch +0 -0
similarity index 100%
rename from package/python/python-015-serial-ioctl-workaround.patch
rename to package/python/python-016-serial-ioctl-workaround.patch
Signature · 1 line
2.0.1
#2 lore raw

PATCH 1/2 python3: fix termios build for xtensa

In reply to Baruch Siach

Dear Baruch Siach,

Quoted 11 lines · Baruch Siach

Forward port the patch from c821210b1bfa (python: fix termios build for xtensa) to python3.

Fixes:
http://autobuild.buildroot.net/results/e7f/e7f71fbcb0796f315052947382fa39d85c5dc8fe/

Signed-off-by Baruch Siach <[email protected]>
---
 .../python3-014-serial-ioctl-workaround.patch      | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 package/python3/python3-014-serial-ioctl-workaround.patch

Both patches applied, thanks!

Thomas

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