* [Buildroot] [PATCH v2 1/2] package/brltty: avoid spurious log messages while decoding scancodes
@ 2017-12-29 14:06 Mario Lang
2017-12-29 14:06 ` [Buildroot] [PATCH v2 2/2] package/brltty: explicitly check if ioperm is available Mario Lang
2017-12-29 20:56 ` [Buildroot] [PATCH v2 1/2] package/brltty: avoid spurious log messages while decoding scancodes Thomas Petazzoni
0 siblings, 2 replies; 7+ messages in thread
From: Mario Lang @ 2017-12-29 14:06 UTC (permalink / raw)
To: buildroot
Patch cerry-picked from upstream, can be removed upon next release.
Signed-off-by: Mario Lang <mlang@blind.guru>
---
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
diff --git a/package/brltty/5.5/0001-Prevent-scancodes-from-generating-spurious-log-messa.patch b/package/brltty/5.5/0001-Prevent-scancodes-from-generating-spurious-log-messa.patch
new file mode 100644
index 0000000000..e6a2005d59
--- /dev/null
+++ b/package/brltty/5.5/0001-Prevent-scancodes-from-generating-spurious-log-messa.patch
@@ -0,0 +1,28 @@
+From 3ea213e47c6771b7e2481f64a98f30c02fcb4867 Mon Sep 17 00:00:00 2001
+From: Mario Lang <mlang@delysid.org>
+Date: Thu, 30 Nov 2017 13:14:47 +0100
+Subject: [PATCH] Prevent scancodes from generating spurious log messages. (ml)
+
+Signed-off-by: Mario Lang <mlang@blind.guru>
+---
+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
+
--
2.15.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH v2 2/2] package/brltty: explicitly check if ioperm is available
2017-12-29 14:06 [Buildroot] [PATCH v2 1/2] package/brltty: avoid spurious log messages while decoding scancodes Mario Lang
@ 2017-12-29 14:06 ` Mario Lang
2017-12-29 16:19 ` Thomas Petazzoni
2017-12-29 20:59 ` Thomas Petazzoni
2017-12-29 20:56 ` [Buildroot] [PATCH v2 1/2] package/brltty: avoid spurious log messages while decoding scancodes Thomas Petazzoni
1 sibling, 2 replies; 7+ messages in thread
From: Mario Lang @ 2017-12-29 14:06 UTC (permalink / raw)
To: buildroot
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 <mlang@blind.guru>
---
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
diff --git a/package/brltty/5.5/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch b/package/brltty/5.5/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch
new file mode 100644
index 0000000000..3dbacb3b57
--- /dev/null
+++ b/package/brltty/5.5/0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch
@@ -0,0 +1,31 @@
+From 28dde6749327fd15a1b8b7bcf5cc74a95598582a Mon Sep 17 00:00:00 2001
+From: Mario Lang <mlang@delysid.org>
+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 <mlang@blind.guru>
+---
+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
+
diff --git a/package/brltty/brltty.mk b/package/brltty/brltty.mk
index 9621d4f9c1..16d804dabf 100644
--- a/package/brltty/brltty.mk
+++ b/package/brltty/brltty.mk
@@ -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
--
2.15.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v2 2/2] package/brltty: explicitly check if ioperm is available
2017-12-29 14:06 ` [Buildroot] [PATCH v2 2/2] package/brltty: explicitly check if ioperm is available Mario Lang
@ 2017-12-29 16:19 ` Thomas Petazzoni
2017-12-29 19:22 ` Mario Lang
2017-12-29 20:59 ` Thomas Petazzoni
1 sibling, 1 reply; 7+ messages in thread
From: Thomas Petazzoni @ 2017-12-29 16:19 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 29 Dec 2017 15:06:41 +0100, Mario Lang wrote:
> +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 ?
> -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
Please use BRLTTY_AUTORECONF = YES instead.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v2 2/2] package/brltty: explicitly check if ioperm is available
2017-12-29 16:19 ` Thomas Petazzoni
@ 2017-12-29 19:22 ` Mario Lang
2017-12-29 19:54 ` Thomas Petazzoni
0 siblings, 1 reply; 7+ messages in thread
From: Mario Lang @ 2017-12-29 19:22 UTC (permalink / raw)
To: buildroot
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
> Hello,
>
> On Fri, 29 Dec 2017 15:06:41 +0100, Mario Lang wrote:
>
>> +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.
>> -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
>
> 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.
--
CYa,
?????
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v2 2/2] package/brltty: explicitly check if ioperm is available
2017-12-29 19:22 ` Mario Lang
@ 2017-12-29 19:54 ` Thomas Petazzoni
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2017-12-29 19:54 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 29 Dec 2017 20:22:22 +0100, Mario Lang wrote:
> > 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.
>
> >> -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
> >
> > 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.
OK, thanks for those explanations!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v2 2/2] package/brltty: explicitly check if ioperm is available
2017-12-29 14:06 ` [Buildroot] [PATCH v2 2/2] package/brltty: explicitly check if ioperm is available Mario Lang
2017-12-29 16:19 ` Thomas Petazzoni
@ 2017-12-29 20:59 ` Thomas Petazzoni
1 sibling, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2017-12-29 20:59 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 29 Dec 2017 15:06:41 +0100, Mario Lang wrote:
> 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 <mlang@blind.guru>
> ---
> 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
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH v2 1/2] package/brltty: avoid spurious log messages while decoding scancodes
2017-12-29 14:06 [Buildroot] [PATCH v2 1/2] package/brltty: avoid spurious log messages while decoding scancodes Mario Lang
2017-12-29 14:06 ` [Buildroot] [PATCH v2 2/2] package/brltty: explicitly check if ioperm is available Mario Lang
@ 2017-12-29 20:56 ` Thomas Petazzoni
1 sibling, 0 replies; 7+ messages in thread
From: Thomas Petazzoni @ 2017-12-29 20:56 UTC (permalink / raw)
To: buildroot
Hello,
On Fri, 29 Dec 2017 15:06:40 +0100, Mario Lang wrote:
> +++ 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
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-12-29 20:59 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-29 14:06 [Buildroot] [PATCH v2 1/2] package/brltty: avoid spurious log messages while decoding scancodes Mario Lang
2017-12-29 14:06 ` [Buildroot] [PATCH v2 2/2] package/brltty: explicitly check if ioperm is available Mario Lang
2017-12-29 16:19 ` Thomas Petazzoni
2017-12-29 19:22 ` Mario Lang
2017-12-29 19:54 ` Thomas Petazzoni
2017-12-29 20:59 ` Thomas Petazzoni
2017-12-29 20:56 ` [Buildroot] [PATCH v2 1/2] package/brltty: avoid spurious log messages while decoding scancodes Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox