package/brltty: avoid spurious log messages while decoding scancodes

PATCH New Mario Lang 2 participants 7 messages Dec 29, 2017

lore

Share & tools

lore

Mario Lang

author

2017-12-29 14:06 UTC #0 lore raw

PATCH v2 1/2 package/brltty: avoid spurious log messages while decoding scancodes

Patch cerry-picked from upstream, can be removed upon next release.

Signed-off-by Mario Lang <[email protected]>

---
v2 fixes the commit message to include a package prefix.

 ...ncodes-from-generating-spurious-log-messa.patch | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 package/brltty/5.5/0001-Prevent-scancodes-from-generating-spurious-log-messa.patch

package/brltty/5.5/0001-Prevent-scancodes-from-generating-spurious-log-messa.patch new file +28 -0

new file mode 100644
index 0000000000..e6a2005d59
@@ -0,0 +1,28 @@
+From 3ea213e47c6771b7e2481f64a98f30c02fcb4867 Mon Sep 17 00:00:00 2001
+From: Mario Lang <[email protected]>
+Date: Thu, 30 Nov 2017 13:14:47 +0100
+Subject: [PATCH] Prevent scancodes from generating spurious log messages. (ml)
+
+Signed-off-by: Mario Lang <[email protected]>
+---
+This patch was taken from upstream, and can be removed when 5.6 is out.
+
+ Drivers/Braille/HandyTech/braille.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Drivers/Braille/HandyTech/braille.c b/Drivers/Braille/HandyTech/braille.c
+index ef95fd15b..f7e605c1a 100644
+--- a/Drivers/Braille/HandyTech/braille.c
++++ b/Drivers/Braille/HandyTech/braille.c
+@@ -1560,7 +1560,7 @@ brl_readCommand (BrailleDisplay *brl, KeyTableCommandContext context) {
+                   case HT_EXTPKT_Scancode: {
+                     while (length--)
+                       enqueueCommand(BRL_CMD_BLK(PASSAT) | BRL_ARG_PUT(*bytes++));
+-                    break;
++                    continue;
+                   }
+ 
+                   case HT_EXTPKT_GetRTC: {
+-- 
+2.15.0
+

Signature · 1 line

2.15.0

Mario Lang

author

2017-12-29 14:06 UTC #1 lore raw

PATCH v2 2/2 package/brltty: explicitly check if ioperm is available

ioperm, inb and outb are i386 specific functions usually not available on non-PC archs. Check if ioperm is available before trying to use it.

Patch cherry-picked from upstream, can be removed when 5.6 is out.

Fixes:
http://autobuild.buildroot.net/results/f09974f2ba24319e55e578ece34bb2e7e8bb3c43
http://autobuild.buildroot.net/results/7d502f280c46f0d1e2678140f9117fcc59bc2d7b

Signed-off-by Mario Lang <[email protected]>

---
v2 fixes commit message and adds forgotten dependency on host-autoconf.

 ...operm-to-make-sure-the-platform-supports-.patch | 31 ++++++++++++++++++++++
 package/brltty/brltty.mk                           |  8 +++++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 package/brltty/5.5/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch

package/brltty/5.5/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch new file +31 -0

new file mode 100644
index 0000000000..3dbacb3b57
@@ -0,0 +1,31 @@
+From 28dde6749327fd15a1b8b7bcf5cc74a95598582a Mon Sep 17 00:00:00 2001
+From: Mario Lang <[email protected]>
+Date: Fri, 29 Dec 2017 10:35:05 +0100
+Subject: [PATCH] Check for ioperm to make sure the platform supports ports
+ I/O. (ml)
+
+Signed-off-by: Mario Lang <[email protected]>
+---
+This patch was taken from upstream, and can be removed when 5.6 is out.
+
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5e94d33bd..07119dd9f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1446,7 +1446,9 @@ BRLTTY_ARG_PACKAGE([ports], [I/O ports], [], [dnl
+       ports_package="kfreebsd"
+       ;;
+    linux*)
+-      ports_package="glibc"
++      AC_CHECK_FUNC([ioperm], [
++         ports_package="glibc"
++      ])
+       ;;
+    mingw*)
+       ports_package="windows"
+-- 
+2.15.0
+

package/brltty/brltty.mk +7 -1

index 9621d4f9c1..16d804dabf 100644
@@ -11,7 +11,7 @@ BRLTTY_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install
 BRLTTY_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install
 BRLTTY_LICENSE_FILES = LICENSE-GPL LICENSE-LGPL
 
-BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
+BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-autoconf
 
 BRLTTY_CONF_OPTS = \
 	--disable-java-bindings \

@@ -24,6 +24,12 @@ BRLTTY_CONF_OPTS = \
 	--without-mikropuhe --without-speechd --without-swift \
 	--without-theta --without-viavoice
 
+define BRLTTY_AUTOCONF
+	cd $(BRLTTY_SRCDIR) && $(AUTOCONF)
+endef
+
+BRLTTY_PRE_CONFIGURE_HOOKS += BRLTTY_AUTOCONF
+
 ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y)
 BRLTTY_DEPENDENCIES += bluez5_utils
 BRLTTY_CONF_OPTS += --with-bluetooth-package

Signature · 1 line

2.15.0

Thomas Petazzoni

2017-12-29 16:19 UTC #2 lore raw

PATCH v2 2/2 package/brltty: explicitly check if ioperm is available

Hello,

package/brltty/5.5/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch line 24

Quoted 11 lines · Mario Lang

package/brltty/5.5/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch new file +11 -0

+diff --git a/configure.ac b/configure.ac
+index 5e94d33bd..07119dd9f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1446,7 +1446,9 @@ BRLTTY_ARG_PACKAGE([ports], [I/O ports], [], [dnl
+       ports_package="kfreebsd"
+       ;;
+    linux*)
+-      ports_package="glibc"
++      AC_CHECK_FUNC([ioperm], [
++         ports_package="glibc"

This seems weird. What happens then when ioperm() is not available ? Which ports_package is used ?

Quoted 6 lines

package/brltty/brltty.mk +1 -1

-BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
+BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-autoconf
 
 BRLTTY_CONF_OPTS = \
 	--disable-java-bindings \

package/brltty/brltty.mk BRLTTY_CONF_OPTS = \ · line 31

Quoted 8 lines

package/brltty/brltty.mk +5 -0

@@ -24,6 +24,12 @@ BRLTTY_CONF_OPTS = \
 	--without-mikropuhe --without-speechd --without-swift \
 	--without-theta --without-viavoice
 
+define BRLTTY_AUTOCONF
+	cd $(BRLTTY_SRCDIR) && $(AUTOCONF)
+endef
+
+BRLTTY_PRE_CONFIGURE_HOOKS += BRLTTY_AUTOCONF

Please use BRLTTY_AUTORECONF = YES instead.

Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Mario Lang

author

2017-12-29 19:22 UTC #3 lore raw

PATCH v2 2/2 package/brltty: explicitly check if ioperm is available

Quoted 4 lines · Thomas Petazzoni

Hello,
On Fri, 29 Dec 2017 15:06:41 +0100, Mario Lang wrote:

Quoted 14 lines

package/brltty/5.5/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch line 24
Quoted 11 lines
package/brltty/5.5/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch new file +11 -0
+diff --git a/configure.ac b/configure.ac
+index 5e94d33bd..07119dd9f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1446,7 +1446,9 @@ BRLTTY_ARG_PACKAGE([ports], [I/O ports], [], [dnl
+       ports_package="kfreebsd"
+       ;;
+    linux*)
+-      ports_package="glibc"
++      AC_CHECK_FUNC([ioperm], [
++         ports_package="glibc"
This seems weird. What happens then when ioperm() is not available ? Which ports_package is used ?

"none", which is exactly what we want. Patch already accepted by upstream. The "ports package" is to support Braille displays connected via the parallel port, which basically no longer exist these days. All relevant models work via USB, Bluetooth or plain serial ports these days.

Quoted 9 lines

package/brltty/brltty.mk +1 -1

-BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
+BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-autoconf
 
 BRLTTY_CONF_OPTS = \
 	--disable-java-bindings \

@@ -24,6 +24,12 @@ BRLTTY_CONF_OPTS = \
 	--without-mikropuhe --without-speechd --without-swift \
 	--without-theta --without-viavoice

Quoted 7 lines

package/brltty/brltty.mk BRLTTY_CONF_OPTS = \ · line 31
Quoted 5 lines
package/brltty/brltty.mk +5 -0
+define BRLTTY_AUTOCONF
+	cd $(BRLTTY_SRCDIR) && $(AUTOCONF)
+endef
+
+BRLTTY_PRE_CONFIGURE_HOOKS += BRLTTY_AUTOCONF
Please use BRLTTY_AUTORECONF = YES instead.

brltty doesn't work with autoreconf. It has its own autogen script, which basically does some dependency calculations (with tcl, a dep I'd like to avoid) and a plain autoconf. So I copied that behaviour, since autoreconf fails with problems about autoheaders.

Signature · 2 lines

CYa,
  ?????

Thomas Petazzoni

2017-12-29 19:54 UTC #4 lore raw

PATCH v2 2/2 package/brltty: explicitly check if ioperm is available

Hello,

Quoted 25 lines · Mario Lang

Quoted 2 lines
This seems weird. What happens then when ioperm() is not available ? Which ports_package is used ?
"none", which is exactly what we want. Patch already accepted by upstream. The "ports package" is to support Braille displays connected via the parallel port, which basically no longer exist these days. All relevant models work via USB, Bluetooth or plain serial ports these days.
Quoted 9 lines
Quoted 9 lines
package/brltty/brltty.mk +1 -1
-BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
+BRLTTY_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES) host-autoconf
 
 BRLTTY_CONF_OPTS = \
 	--disable-java-bindings \
@@ -24,6 +24,12 @@ BRLTTY_CONF_OPTS = \
 	--without-mikropuhe --without-speechd --without-swift \
 	--without-theta --without-viavoice
 
Quoted 7 lines
package/brltty/brltty.mk BRLTTY_CONF_OPTS = \ · line 31
Quoted 5 lines
package/brltty/brltty.mk +5 -0
+define BRLTTY_AUTOCONF
+	cd $(BRLTTY_SRCDIR) && $(AUTOCONF)
+endef
+
+BRLTTY_PRE_CONFIGURE_HOOKS += BRLTTY_AUTOCONF  
Please use BRLTTY_AUTORECONF = YES instead.

Quoted 4 lines

brltty doesn't work with autoreconf. It has its own autogen script, which basically does some dependency calculations (with tcl, a dep I'd like to avoid) and a plain autoconf. So I copied that behaviour, since autoreconf fails with problems about autoheaders.

OK, thanks for those explanations!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Thomas Petazzoni

2017-12-29 20:59 UTC #5 lore raw

PATCH v2 2/2 package/brltty: explicitly check if ioperm is available

In reply to Mario Lang

Hello,

Quoted 4 lines · Mario Lang

ioperm, inb and outb are i386 specific functions usually not available on non-PC archs. Check if ioperm is available before trying to use it.

Quoted 8 lines

Patch cherry-picked from upstream, can be removed when 5.6 is out.
Fixes:
http://autobuild.buildroot.net/results/f09974f2ba24319e55e578ece34bb2e7e8bb3c43
http://autobuild.buildroot.net/results/7d502f280c46f0d1e2678140f9117fcc59bc2d7b
Signed-off-by Mario Lang <[email protected]>
---
v2 fixes commit message and adds forgotten dependency on host-autoconf.

Like for PATCH 1/2, I've moved the patch back into package/brltty/, since a per-version sub-directory is not needed. I've also added a comment in the .mk file about why we're doing autoconf, and not an autoreconf.

Best regards,

Thomas

Signature · 3 lines

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

Thomas Petazzoni

2017-12-29 20:56 UTC #6 lore raw

PATCH v2 1/2 package/brltty: avoid spurious log messages while decoding scancodes

In reply to Mario Lang

Hello,

Quoted 1 line · Mario Lang

+++ b/package/brltty/5.5/0001-Prevent-scancodes-from-generating-spurious-log-messa.patch

This patch shouldn't have been in the 5.5/ sub-folder. Indeed, using per-version sub-directories for patches is only useful for packages that support multiple versions, which isn't the case of brltty.

So I've moved the patch in package/brltty/ and applied. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com