Bump buidlroot version to 2018.02.6
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
From b3b0e47015e9162f519730789976157c7cc38178 Mon Sep 17 00:00:00 2001
|
||||
From: Mario Lang <mlang@delysid.org>
|
||||
Date: Fri, 29 Dec 2017 14:52:37 +0100
|
||||
Subject: [PATCH] Remove MKOBJ in favour of MKMOD. (ml)
|
||||
|
||||
Calling ld directly can lead to problems when cross-compiling.
|
||||
|
||||
Upstream: https://github.com/brltty/brltty/commit/4c8aba42e246b96d10ffcbd57653682375499e46
|
||||
Signed-off-by: Mario Lang <mlang@blind.guru>
|
||||
---
|
||||
Drivers/Braille/EuroBraille/Makefile.in | 2 +-
|
||||
config.mk.in | 1 -
|
||||
configure.ac | 10 ----------
|
||||
3 files changed, 1 insertion(+), 12 deletions(-)
|
||||
|
||||
diff --git a/Drivers/Braille/EuroBraille/Makefile.in b/Drivers/Braille/EuroBraille/Makefile.in
|
||||
index 0500aa70e..ce8a3d1a4 100644
|
||||
--- a/Drivers/Braille/EuroBraille/Makefile.in
|
||||
+++ b/Drivers/Braille/EuroBraille/Makefile.in
|
||||
@@ -28,7 +28,7 @@ SRC_FILES = eu_braille.c eu_clio.c eu_esysiris.c
|
||||
OBJ_FILES = $(SRC_FILES:.c=.$O)
|
||||
|
||||
braille.$O: $(OBJ_FILES)
|
||||
- $(MKOBJ) $@ $(OBJ_FILES)
|
||||
+ $(MKMOD) $@ $(OBJ_FILES)
|
||||
|
||||
%.$O: $(SRC_DIR)/%.c
|
||||
$(CC) $(BRL_CFLAGS) -o $@ -c $<
|
||||
diff --git a/config.mk.in b/config.mk.in
|
||||
index 686f547e6..8d1da79b4 100644
|
||||
--- a/config.mk.in
|
||||
+++ b/config.mk.in
|
||||
@@ -250,7 +250,6 @@ LD = @LD@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
LDLIBS = $(ICU_LIBS) $(POLKIT_LIBS) $(SYSTEM_LIBS) @LIBS@
|
||||
|
||||
-MKOBJ = @MKOBJ@
|
||||
MKMOD = @MKMOD@
|
||||
MKLIB = @MKLIB@
|
||||
CONFLIBDIR = @CONFLIBDIR@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 07119dd9f..ad80b8d60 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -428,16 +428,6 @@ AC_SUBST([can_make_manual])
|
||||
test "${DOXYGEN}" = "false" && can_make_BrlAPIref=no || can_make_BrlAPIref=yes
|
||||
AC_SUBST([can_make_BrlAPIref])
|
||||
|
||||
-AC_CACHE_CHECK([for make relocatable object command], [brltty_cv_prog_mkobj], [dnl
|
||||
-case "${host_os}"
|
||||
-in
|
||||
- *)
|
||||
- brltty_cv_prog_mkobj="\$(LD) -r -o"
|
||||
- ;;
|
||||
-esac])
|
||||
-MKOBJ="${brltty_cv_prog_mkobj}"
|
||||
-AC_SUBST([MKOBJ])
|
||||
-
|
||||
AC_CACHE_CHECK([for loadable module creation command], [brltty_cv_prog_mkmod], [dnl
|
||||
case "${host_os}"
|
||||
in
|
||||
--
|
||||
2.15.0
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
From 088666535a045dae71bd2fcc6b3a1553023106ce Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Wed, 22 Aug 2018 10:10:19 +0200
|
||||
Subject: [PATCH] buildsys: fix cross-compilation
|
||||
|
||||
Some identifiers for includes and libs paths may contain digit, e.g.
|
||||
X11_PACKAGE or ATSPI2_PACKAGE or GLIB2_PACKAGE...
|
||||
|
||||
Also detect those identifiers when doing cros-compilation, so that the
|
||||
_FOR_BUILD variants are really created and do not clash with the target
|
||||
variants.
|
||||
|
||||
Fixes:
|
||||
http://autobuild.buildroot.org/results/a37/a37782b3cfc1a96cc129db8fade20a36a7b2d470/build-end.log
|
||||
http://autobuild.buildroot.org/results/97e/97edc6a47d2140968e84b409cdc960604e5896f2/build-end.log
|
||||
[...]
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
---
|
||||
Upstram status: submitted
|
||||
https://github.com/brltty/brltty/pull/142
|
||||
---
|
||||
mk4build | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mk4build b/mk4build
|
||||
index db90c86a9..551283825 100755
|
||||
--- a/mk4build
|
||||
+++ b/mk4build
|
||||
@@ -112,7 +112,7 @@ fi
|
||||
|
||||
sedScript="${outputName}.${sedExtension}"
|
||||
sed -n -e '
|
||||
-s/^ *\([A-Za-z][A-Za-z_]*\) *=.*$/\1/
|
||||
+s/^ *\([A-Za-z][A-Za-z0-9_]*\) *=.*$/\1/
|
||||
t found
|
||||
d
|
||||
:found
|
||||
--
|
||||
2.14.1
|
||||
|
||||
22
bsp/buildroot/package/brltty/Config.in
Normal file
22
bsp/buildroot/package/brltty/Config.in
Normal file
@@ -0,0 +1,22 @@
|
||||
config BR2_PACKAGE_BRLTTY
|
||||
bool "brltty"
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
help
|
||||
A daemon providing access to the Linux console for a blind
|
||||
person using a refreshable braille display.
|
||||
|
||||
http://brltty.com/
|
||||
|
||||
if BR2_PACKAGE_BRLTTY
|
||||
|
||||
config BR2_PACKAGE_BRLTTY_TEXT_TABLE
|
||||
string "text-table"
|
||||
|
||||
endif
|
||||
|
||||
comment "brltty needs a toolchain w/ dynamic lib, threads, wchar"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
|
||||
40
bsp/buildroot/package/brltty/S10brltty
Normal file
40
bsp/buildroot/package/brltty/S10brltty
Normal file
@@ -0,0 +1,40 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# brltty Starts brltty.
|
||||
#
|
||||
|
||||
start() {
|
||||
printf "Starting brltty: "
|
||||
start-stop-daemon -S -q -p /var/run/brltty.pid \
|
||||
--exec /usr/bin/brltty -- -P /var/run/brltty.pid "$@"
|
||||
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
||||
}
|
||||
stop() {
|
||||
printf "Stopping brltty: "
|
||||
start-stop-daemon -K -q -p /var/run/brltty.pid
|
||||
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
||||
}
|
||||
restart() {
|
||||
stop
|
||||
start "$@"
|
||||
}
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
restart|reload)
|
||||
restart
|
||||
;;
|
||||
force-reload)
|
||||
restart
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop|restart|force-reload}"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit $?
|
||||
3
bsp/buildroot/package/brltty/brltty.hash
Normal file
3
bsp/buildroot/package/brltty/brltty.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
sha256 4ebf1df5922df0efccac4795f5bd1c514fc850348c34d9ec0868e2798b565a36 brltty-5.5.tar.xz
|
||||
sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad LICENSE-GPL
|
||||
sha256 d80c9d084ebfb50ea1ed91bfbc2410d6ce542097a32c43b00781b83adcb8c77f LICENSE-LGPL
|
||||
110
bsp/buildroot/package/brltty/brltty.mk
Normal file
110
bsp/buildroot/package/brltty/brltty.mk
Normal file
@@ -0,0 +1,110 @@
|
||||
################################################################################
|
||||
#
|
||||
# brltty
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BRLTTY_VERSION = 5.5
|
||||
BRLTTY_SOURCE = brltty-$(BRLTTY_VERSION).tar.xz
|
||||
BRLTTY_SITE = http://brltty.com/archive
|
||||
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) host-autoconf host-pkgconf
|
||||
|
||||
BRLTTY_CONF_OPTS = \
|
||||
--disable-java-bindings \
|
||||
--disable-lisp-bindings \
|
||||
--disable-ocaml-bindings \
|
||||
--disable-python-bindings \
|
||||
--disable-tcl-bindings \
|
||||
--disable-x \
|
||||
--without-midi-package \
|
||||
--without-mikropuhe --without-speechd --without-swift \
|
||||
--without-theta --without-viavoice
|
||||
|
||||
# Autoreconf is needed because we're patching configure.ac in
|
||||
# 0002-Check-for-ioperm-to-make-sure-the-platform-supports-.patch. However,
|
||||
# a plain autoreconf doesn't work, because this package is only
|
||||
# autoconf-based.
|
||||
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
|
||||
else
|
||||
BRLTTY_CONF_OPTS += --without-bluetooth-package
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ESPEAK),y)
|
||||
BRLTTY_DEPENDENCIES += espeak
|
||||
BRLTTY_CONF_OPTS += --with-espeak=$(TARGET_DIR)/usr
|
||||
else
|
||||
BRLTTY_CONF_OPTS += --without-espeak
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FLITE),y)
|
||||
BRLTTY_DEPENDENCIES += flite
|
||||
BRLTTY_CONF_OPTS += --with-flite=$(STAGING_DIR)/usr
|
||||
else
|
||||
BRLTTY_CONF_OPTS += --without-flite
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ICU),y)
|
||||
BRLTTY_DEPENDENCIES += icu
|
||||
BRLTTY_CONF_OPTS += --enable-icu
|
||||
else
|
||||
BRLTTY_CONF_OPTS += --disable-icu
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_NCURSES),y)
|
||||
BRLTTY_DEPENDENCIES += ncurses
|
||||
BRLTTY_CONF_OPTS += --with-curses
|
||||
else
|
||||
BRLTTY_CONF_OPTS += --without-curses
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
|
||||
BRLTTY_DEPENDENCIES += systemd
|
||||
BRLTTY_CONF_OPTS += --with-service-package
|
||||
else
|
||||
BRLTTY_CONF_OPTS += --without-service-package
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_SYSTEM_ENABLE_NLS),y)
|
||||
BRLTTY_CONF_OPTS += --enable-i18n
|
||||
else
|
||||
BRLTTY_CONF_OPTS += --disable-i18n
|
||||
endif
|
||||
|
||||
BRLTTY_TEXT_TABLE = $(call qstrip,$(BR2_PACKAGE_BRLTTY_TEXT_TABLE))
|
||||
ifneq ($(BRLTTY_TEXT_TABLE),)
|
||||
BRLTTY_CONF_OPTS += --with-text-table=$(BRLTTY_TEXT_TABLE)
|
||||
endif
|
||||
|
||||
define BRLTTY_INSTALL_CONF
|
||||
$(INSTALL) -D -m 644 $(@D)/Documents/brltty.conf $(TARGET_DIR)/etc/brltty.conf
|
||||
endef
|
||||
|
||||
BRLTTY_POST_INSTALL_TARGET_HOOKS += BRLTTY_INSTALL_CONF
|
||||
|
||||
define BRLTTY_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -D -m 0755 package/brltty/S10brltty \
|
||||
$(TARGET_DIR)/etc/init.d/S10brltty
|
||||
endef
|
||||
|
||||
define BRLTTY_INSTALL_INIT_SYSTEMD
|
||||
$(INSTALL) -D -m 0644 package/brltty/brltty.service \
|
||||
$(TARGET_DIR)/usr/lib/systemd/system/brltty.service
|
||||
|
||||
mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants
|
||||
ln -fs ../../../../usr/lib/systemd/system/brltty.service \
|
||||
$(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/brltty.service
|
||||
endef
|
||||
|
||||
$(eval $(autotools-package))
|
||||
23
bsp/buildroot/package/brltty/brltty.service
Normal file
23
bsp/buildroot/package/brltty/brltty.service
Normal file
@@ -0,0 +1,23 @@
|
||||
[Unit]
|
||||
Description=Braille Device Support
|
||||
Documentation=man:brltty(1)
|
||||
Documentation=http://brltty.com/
|
||||
|
||||
DefaultDependencies=no
|
||||
Before=sysinit.target
|
||||
After=systemd-udev-settle.service
|
||||
Wants=systemd-udev-settle.service
|
||||
|
||||
[Service]
|
||||
Type=simple
|
||||
ExecStart=/usr/bin/brltty --no-daemon
|
||||
TimeoutStartSec=5
|
||||
TimeoutStopSec=10
|
||||
Restart=always
|
||||
RestartSec=30
|
||||
Nice=-10
|
||||
OOMScoreAdjust=-900
|
||||
|
||||
[Install]
|
||||
WantedBy=sysinit.target
|
||||
|
||||
Reference in New Issue
Block a user