From 5b80bfd7bffd4c20d80b7c70a7130529e9a755dd Mon Sep 17 00:00:00 2001 From: ToshikazuOhiwa Date: Mon, 30 Mar 2020 09:24:26 +0900 Subject: agl-basesystem --- ...-sigemptyset-API-instead-of-__sigemptyset.patch | 34 ++++++++++++++++ .../meta-oe/recipes-support/gpm/gpm/gpm.service.in | 9 +++++ .../meta-oe/recipes-support/gpm/gpm/init | 32 +++++++++++++++ .../meta-oe/recipes-support/gpm/gpm/no-docs.patch | 18 +++++++++ .../recipes-support/gpm/gpm/processcreds.patch | 12 ++++++ .../meta-oe/recipes-support/gpm/gpm_git.bb | 47 ++++++++++++++++++++++ 6 files changed, 152 insertions(+) create mode 100644 external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch create mode 100644 external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/gpm.service.in create mode 100644 external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/init create mode 100644 external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/no-docs.patch create mode 100644 external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/processcreds.patch create mode 100644 external/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb (limited to 'external/meta-openembedded/meta-oe/recipes-support/gpm') diff --git a/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch b/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch new file mode 100644 index 00000000..a9198166 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch @@ -0,0 +1,34 @@ +From 52e6cf052b1f938fcca1bc24d578fe0bfd972988 Mon Sep 17 00:00:00 2001 +From: Khem Raj +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 +--- +Upstream-Status: Submitted + + 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.13.1 + diff --git a/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/gpm.service.in b/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/gpm.service.in new file mode 100644 index 00000000..ee6c040f --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/gpm.service.in @@ -0,0 +1,9 @@ +[Unit] +Description=Virtual console mouse server + +[Service] +Type=forking +ExecStart=@bindir@/gpm -m /dev/input/mice -t imps2 + +[Install] +WantedBy=multi-user.target diff --git a/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/init b/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/init new file mode 100644 index 00000000..2dcf9ab0 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/init @@ -0,0 +1,32 @@ +#! /bin/sh + +# Grab the common functions +#. /etc/init.d/functions + +# FIXME: +# Add a configuration file for GPM here + +test -x /usr/sbin/gpm || exit 0 + +case "$1" in + start) + if [ ! -p /dev/gpmdata ]; then + mkfifo /dev/gpmdata + fi + + echo "Starting GPM:" + start-stop-daemon -S -x /usr/sbin/gpm -- -R -m /dev/psaux -t ps2 + ;; + stop) + echo "Stopping GPM:" + start-stop-daemon -K -x /usr/sbin/gpm + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + usage /etc/init.d/gpm +esac + +exit 0 diff --git a/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/no-docs.patch b/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/no-docs.patch new file mode 100644 index 00000000..3faef84e --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/no-docs.patch @@ -0,0 +1,18 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +Index: gpm-1.99.7/Makefile.in +=================================================================== +--- gpm-1.99.7.orig/Makefile.in 2008-07-24 03:36:35.000000000 -0700 ++++ gpm-1.99.7/Makefile.in 2010-06-22 18:28:45.269507001 -0700 +@@ -19,7 +19,7 @@ + # user-overridable flags, but it's also all the implicit rule looks at. + # missing ? + +-SUBDIRS = src doc contrib ++SUBDIRS = src + + + ### simple, but effective rules diff --git a/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/processcreds.patch b/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/processcreds.patch new file mode 100644 index 00000000..d647eca0 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm/processcreds.patch @@ -0,0 +1,12 @@ +Index: gpm-1.99.7/src/daemon/processconn.c +=================================================================== +--- gpm-1.99.7.orig/src/daemon/processconn.c 2010-09-29 17:36:18.571782951 +0400 ++++ gpm-1.99.7/src/daemon/processconn.c 2010-09-29 17:42:44.659991758 +0400 +@@ -20,6 +20,7 @@ + * + ********/ + ++#define _GNU_SOURCE + #include /* accept */ + #include /* malloc */ + #include /* close */ diff --git a/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb b/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb new file mode 100644 index 00000000..dcc9d68e --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb @@ -0,0 +1,47 @@ +DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \ +for the console and xterm, with sample clients included \ +(emacs, etc)." +SECTION = "console/utils" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" + +PV = "1.99.7+git${SRCREV}" +PR = "r2" +SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77" + +DEPENDS = "ncurses bison-native" + +SRC_URI = "git://github.com/telmich/gpm;protocol=git \ + file://init \ + file://no-docs.patch \ + file://processcreds.patch \ + file://gpm.service.in \ + file://0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools-brokensep update-rc.d systemd + +INITSCRIPT_NAME = "gpm" +INITSCRIPT_PARAMS = "defaults" + +do_configure_prepend() { + (cd ${S};./autogen.sh;cd -) +} + +do_install_append () { + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${systemd_system_unitdir} + sed 's:@bindir@:${bindir}:' < ${WORKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service + fi + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + install -D -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm + fi + install -D -m 0644 ${S}/src/headers/gpm.h ${D}${includedir}/gpm.h + ln -s libgpm.so.2 ${D}${libdir}/libgpm.so +} + +SYSTEMD_SERVICE_${PN} = "gpm.service" + +FILES_${PN} += "${datadir}/emacs" -- cgit 1.2.3-korg