Import buildroot 2016.02.01
This commit is contained in:
@@ -0,0 +1,71 @@
|
||||
From eb0e14f8a5c414603b2e882df54b9fec138104ec Mon Sep 17 00:00:00 2001
|
||||
From: Dima Krasner <dima@dimakrasner.com>
|
||||
Date: Wed, 12 Nov 2014 23:06:46 +0200
|
||||
Subject: [PATCH] Added musl support to libgpm and the daemon.
|
||||
|
||||
[Upstream patch backported from the github repository,
|
||||
https://github.com/telmich/gpm/commit/d88fb1de5803c366ab62f7de9ee5d83207fb2afe.]
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
src/daemon/open_console.c | 1 +
|
||||
src/prog/display-buttons.c | 1 +
|
||||
src/prog/display-coords.c | 1 +
|
||||
src/prog/gpm-root.y | 4 ++--
|
||||
4 files changed, 5 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c
|
||||
index 98297c9..4d6c0af 100644
|
||||
--- a/src/daemon/open_console.c
|
||||
+++ b/src/daemon/open_console.c
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include <fcntl.h> /* open and co. */
|
||||
#include <sys/stat.h> /* stat() */
|
||||
+#include <sys/types.h> /* major() */
|
||||
#include <sys/ioctl.h> /* ioctl */
|
||||
|
||||
/* Linux specific (to be outsourced in gpm2 */
|
||||
diff --git a/src/prog/display-buttons.c b/src/prog/display-buttons.c
|
||||
index de8e5b2..38d2f11 100644
|
||||
--- a/src/prog/display-buttons.c
|
||||
+++ b/src/prog/display-buttons.c
|
||||
@@ -36,6 +36,7 @@
|
||||
#include <stdio.h> /* printf() */
|
||||
#include <time.h> /* time() */
|
||||
#include <errno.h> /* errno */
|
||||
+#include <sys/select.h> /* fd_set and FD_* */
|
||||
#include <gpm.h> /* gpm information */
|
||||
|
||||
/* display resulting data */
|
||||
diff --git a/src/prog/display-coords.c b/src/prog/display-coords.c
|
||||
index ed15c8a..411283a 100644
|
||||
--- a/src/prog/display-coords.c
|
||||
+++ b/src/prog/display-coords.c
|
||||
@@ -37,6 +37,7 @@
|
||||
#include <stdio.h> /* printf() */
|
||||
#include <time.h> /* time() */
|
||||
#include <errno.h> /* errno */
|
||||
+#include <sys/select.h> /* fd_set and FD_* */
|
||||
#include <gpm.h> /* gpm information */
|
||||
|
||||
/* display resulting data */
|
||||
diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
|
||||
index 069d801..188ae35 100644
|
||||
--- a/src/prog/gpm-root.y
|
||||
+++ b/src/prog/gpm-root.y
|
||||
@@ -1199,9 +1199,9 @@ int main(int argc, char **argv)
|
||||
#if defined(__GLIBC__)
|
||||
__sigemptyset(&childaction.sa_mask);
|
||||
#else /* __GLIBC__ */
|
||||
- childaction.sa_mask=0;
|
||||
+ sigemptyset(&childaction.sa_mask);
|
||||
#endif /* __GLIBC__ */
|
||||
- childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
|
||||
+ childaction.sa_flags=0;
|
||||
sigaction(SIGCHLD,&childaction,NULL);
|
||||
|
||||
/*....................................... Connect and get your buffer */
|
||||
--
|
||||
2.1.0
|
||||
|
||||
26
firmware/buildroot/package/gpm/Config.in
Normal file
26
firmware/buildroot/package/gpm/Config.in
Normal file
@@ -0,0 +1,26 @@
|
||||
config BR2_PACKAGE_GPM
|
||||
bool "gpm"
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_USE_MMU # fork()
|
||||
help
|
||||
"gpm" means general purpose mouse (server) and provides mouse support
|
||||
for Linux virtual consoles.
|
||||
gpm-root (to draw menus in current virtual console; config file in
|
||||
/etc/gpm-root.conf) and disable-paste (to disable paste buffer for
|
||||
security reasons), will also be installed.
|
||||
|
||||
http://www.nico.schottelius.org/software/gpm/
|
||||
|
||||
if BR2_PACKAGE_GPM
|
||||
|
||||
config BR2_PACKAGE_GPM_INSTALL_TEST_TOOLS
|
||||
bool "install test tools"
|
||||
help
|
||||
Install gpm test tools (get-versions, mev, hltest, mouse-test,
|
||||
display-buttons & display-coords).
|
||||
|
||||
endif
|
||||
|
||||
comment "gpm mouse server needs a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
||||
depends on BR2_USE_MMU
|
||||
2
firmware/buildroot/package/gpm/gpm.hash
Normal file
2
firmware/buildroot/package/gpm/gpm.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally computed:
|
||||
sha256 a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c gpm-1.20.7.tar.lzma
|
||||
70
firmware/buildroot/package/gpm/gpm.mk
Normal file
70
firmware/buildroot/package/gpm/gpm.mk
Normal file
@@ -0,0 +1,70 @@
|
||||
################################################################################
|
||||
#
|
||||
# gpm
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GPM_VERSION = 1.20.7
|
||||
GPM_SOURCE = gpm-$(GPM_VERSION).tar.lzma
|
||||
GPM_SITE = http://www.nico.schottelius.org/software/gpm/archives
|
||||
GPM_LICENSE = GPLv2+
|
||||
GPM_LICENSE_FILES = COPYING
|
||||
GPM_INSTALL_STAGING = YES
|
||||
GPM_DEPENDENCIES = host-bison
|
||||
|
||||
# if not already installed in staging dir, gpm Makefile may fail to find some
|
||||
# of the headers needed to generate build dependencies, the first time it is
|
||||
# built. CPPFLAGS is used to pass the right include path to dependency rules.
|
||||
GPM_CONF_ENV = CPPFLAGS="$(TARGET_CPPFLAGS) -I$(@D)/src/headers/" \
|
||||
ac_cv_path_emacs=no
|
||||
|
||||
# For some reason, Microblaze gcc does not define __ELF__, which gpm
|
||||
# configure script uses to determine whether the architecture uses ELF
|
||||
# binaries and therefore can build shared libraries. We fix this by
|
||||
# telling GPM that ELF is used on Microblaze.
|
||||
ifeq ($(BR2_microblaze),y)
|
||||
GPM_CONF_ENV += itz_cv_sys_elf=yes
|
||||
endif
|
||||
|
||||
# gpm and ncurses have a circular dependency. As gpm function GPM_Wgetch()
|
||||
# (requiring ncurses) is not recommended for use by ncurses people themselves
|
||||
# and as it's better to have gpm support in ncurses that the contrary, we force
|
||||
# gpm to not look after ncurses explicitly.
|
||||
# http://invisible-island.net/ncurses/ncurses.faq.html#using_gpm_lib
|
||||
GPM_CONF_OPTS = --without-curses
|
||||
|
||||
# configure is missing but gpm seems not compatible with our autoreconf
|
||||
# mechanism so we have to do it manually instead of using GPM_AUTORECONF = YES
|
||||
define GPM_RUN_AUTOGEN
|
||||
cd $(@D) && PATH=$(BR_PATH) ./autogen.sh
|
||||
endef
|
||||
GPM_PRE_CONFIGURE_HOOKS += GPM_RUN_AUTOGEN
|
||||
|
||||
GPM_DEPENDENCIES += host-automake host-autoconf host-libtool
|
||||
|
||||
# gpm tries to build/install .info doc even if makeinfo isn't installed on the
|
||||
# host, so we have to disable global doc installation to prevent autobuild
|
||||
# errors.
|
||||
define GPM_DISABLE_DOC_INSTALL
|
||||
$(SED) 's/SUBDIRS = src doc contrib/SUBDIRS = src contrib/' \
|
||||
$(@D)/Makefile.in
|
||||
endef
|
||||
GPM_POST_PATCH_HOOKS += GPM_DISABLE_DOC_INSTALL
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GPM_INSTALL_TEST_TOOLS),)
|
||||
define GPM_REMOVE_TEST_TOOLS_FROM_TARGET
|
||||
for tools in mev hltest mouse-test display-buttons \
|
||||
get-versions display-coords; do \
|
||||
rm -f $(TARGET_DIR)/usr/bin/$$tools ; \
|
||||
done
|
||||
endef
|
||||
GPM_POST_INSTALL_TARGET_HOOKS += GPM_REMOVE_TEST_TOOLS_FROM_TARGET
|
||||
endif
|
||||
|
||||
define GPM_INSTALL_GPM_ROOT_CONF_ON_TARGET
|
||||
$(INSTALL) -m 0644 -D $(@D)/conf/gpm-root.conf $(TARGET_DIR)/etc/
|
||||
endef
|
||||
|
||||
GPM_POST_INSTALL_TARGET_HOOKS += GPM_INSTALL_GPM_ROOT_CONF_ON_TARGET
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user