initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -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
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
From 06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa Mon Sep 17 00:00:00 2001
|
||||
From: Kamil Rytarowski <n54@gmx.com>
|
||||
Date: Sat, 4 May 2013 01:30:17 +0200
|
||||
Subject: [PATCH] Install unversioned solibrary
|
||||
|
||||
Unversioned solibraries are shipped with -devel packages in Linux
|
||||
distros. Generate and install it for the consistency.
|
||||
|
||||
[Upstream patch backported from the github repository,
|
||||
https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa]
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
src/Makefile.in | 7 +++----
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||
index 6b60ad3..7e9e2ef 100644
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -79,7 +79,7 @@ prog/%: prog/%.o
|
||||
# | $(SED) '\''s/\($*\)\.o\([ :]*\)/\1.o \1.lo\2/g'\'' > $(DEPDIR)/$@'
|
||||
|
||||
# Do it all!
|
||||
-all: gpm lib/libgpm.so.@abi_lev@ @LIBGPM_A@ $(PROG)
|
||||
+all: gpm lib/libgpm.so.@abi_lev@ lib/libgpm.so @LIBGPM_A@ $(PROG)
|
||||
|
||||
gpm: $(GOBJ)
|
||||
$(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm
|
||||
@@ -168,9 +168,8 @@ lib/libgpm.so.@abi_full@: $(PICS)
|
||||
@LDFLAGS@ $(LDFLAGS) -o lib/libgpm.so.@abi_full@ $^ @LIBS@ @SHARED_LIBS@ $(LIBS)
|
||||
lib/libgpm.so.@abi_lev@: lib/libgpm.so.@abi_full@
|
||||
$(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so.@abi_lev@
|
||||
-# unneeded, isn't it?
|
||||
-#lib/libgpm.so: lib/libgpm.so.@abi_full@
|
||||
-# $(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so
|
||||
+lib/libgpm.so: lib/libgpm.so.@abi_full@
|
||||
+ $(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so
|
||||
|
||||
include $(DEPFILE)
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 445be05fba32c512fd87a0c98b4e9936629ef95e Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
Date: Sat, 20 Feb 2016 17:59:52 +0100
|
||||
Subject: [PATCH 1/1] src/Makefile.in: Really install unversioned solibrary
|
||||
|
||||
This commit is a follow-up to
|
||||
https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa
|
||||
which created libgpm.so but failed to include it in the install target.
|
||||
|
||||
Patch sent upstream: https://github.com/telmich/gpm/pull/11
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
src/Makefile.in | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/Makefile.in b/src/Makefile.in
|
||||
index 7e9e2ef..bca226f 100644
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -115,6 +115,7 @@ install: check
|
||||
if test "x@SHLIB@" != "x" ; then \
|
||||
$(INSTALL_DATA) -m 755 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \
|
||||
cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \
|
||||
+ cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so ; \
|
||||
echo "WARNING: We installed a lib, you should now call ldconfig" ; \
|
||||
echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" ; \
|
||||
echo "Or to update everything just type ldconfig" ; \
|
||||
--
|
||||
2.7.0
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
From fdc42770596e25749f7e2ce0ea97882177397167 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Sun, 25 Jun 2017 07:25:33 -0700
|
||||
Subject: [PATCH] Use sigemptyset API instead of __sigemptyset
|
||||
|
||||
__sigemptyset has been removed from glibc public
|
||||
API headers in upcoming (2.26) release onwards
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Signed-off-by: Petr Vorel <petr.vorel@gmail.com>
|
||||
---
|
||||
src/prog/gpm-root.y | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
|
||||
index 5126c65..76c896c 100644
|
||||
--- a/src/prog/gpm-root.y
|
||||
+++ b/src/prog/gpm-root.y
|
||||
@@ -1196,11 +1196,7 @@ int main(int argc, char **argv)
|
||||
LOG_DAEMON : LOG_USER);
|
||||
/* reap your zombies */
|
||||
childaction.sa_handler=reap_children;
|
||||
-#if defined(__GLIBC__)
|
||||
- __sigemptyset(&childaction.sa_mask);
|
||||
-#else /* __GLIBC__ */
|
||||
sigemptyset(&childaction.sa_mask);
|
||||
-#endif /* __GLIBC__ */
|
||||
childaction.sa_flags=0;
|
||||
sigaction(SIGCHLD,&childaction,NULL);
|
||||
|
||||
--
|
||||
2.14.2
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From b350aee4ea5785a75cb6ad770f6b768c506ebb70 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Mon, 14 Mar 2016 15:39:54 -0400
|
||||
Subject: [PATCH] fix building w/newer glibc
|
||||
|
||||
Linux C libraries are looking to disentangle sysmacros.h from the
|
||||
sys/types.h include, so make sure we pull in the header when it is
|
||||
found.
|
||||
|
||||
Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
|
||||
---
|
||||
src/daemon/open_console.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c
|
||||
index 4d6c0af..6dd43e6 100644
|
||||
--- a/src/daemon/open_console.c
|
||||
+++ b/src/daemon/open_console.c
|
||||
@@ -24,6 +24,10 @@
|
||||
#include <sys/types.h> /* major() */
|
||||
#include <sys/ioctl.h> /* ioctl */
|
||||
|
||||
+#ifdef HAVE_SYS_SYSMACROS_H
|
||||
+#include <sys/sysmacros.h> /* major() w/newer glibc */
|
||||
+#endif
|
||||
+
|
||||
/* Linux specific (to be outsourced in gpm2 */
|
||||
#include <linux/serial.h> /* for serial console check */
|
||||
#include <asm/ioctls.h> /* for serial console check */
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
From f04f24dd5ca5c1c13608b144ab66e2ccd47f106a Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
Date: Sun, 19 Jan 2020 19:53:41 +0000
|
||||
Subject: [PATCH] src/headers/daemon.h: avoid redefinition of
|
||||
'last_selection_time'
|
||||
|
||||
Noticed build failure on gcc-10 as:
|
||||
|
||||
```
|
||||
gcc -L/home/slyfox/dev/git/gpm/src -o gpm mice.o ... report.o tools.o -lm
|
||||
ld: twiddler.o:gpm/src/headers/daemon.h:183:
|
||||
multiple definition of `last_selection_time'; mice.o:gpm/src/headers/daemon.h:183: first defined here
|
||||
ld: synaptics.o:git/gpm/src/headers/daemon.h:183:
|
||||
multiple definition of `last_selection_time'; mice.o:git/gpm/src/headers/daemon.h:183: first defined here
|
||||
```
|
||||
|
||||
gcc-10 will change the default from -fcommon to fno-common:
|
||||
https://gcc.gnu.org/PR85678.
|
||||
|
||||
The error also happens if CFLAGS=-fno-common passed explicitly.
|
||||
|
||||
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
|
||||
Signed-off-by: Heiko Thiery <heiko.thiery@gmail.com>
|
||||
---
|
||||
src/headers/daemon.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/headers/daemon.h b/src/headers/daemon.h
|
||||
index a8936ad..24a1a97 100644
|
||||
--- a/src/headers/daemon.h
|
||||
+++ b/src/headers/daemon.h
|
||||
@@ -180,7 +180,7 @@ extern struct mouse_features mouse_table[3],
|
||||
extern Gpm_Type mice[];
|
||||
extern Gpm_Type *repeated_type;
|
||||
|
||||
-time_t last_selection_time;
|
||||
+extern time_t last_selection_time;
|
||||
|
||||
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -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
|
||||
@@ -0,0 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c gpm-1.20.7.tar.lzma
|
||||
sha256 1b2a567f289f66a143c56353e7b3d4fa5862514a5e3c5cfdf8b02ee5e5aaa953 COPYING
|
||||
@@ -0,0 +1,72 @@
|
||||
################################################################################
|
||||
#
|
||||
# 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 = GPL-2.0+
|
||||
GPM_LICENSE_FILES = COPYING
|
||||
GPM_SELINUX_MODULES = gpm
|
||||
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