diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/gpm')
4 files changed, 6 insertions, 42 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/gpm/gpm/gpm.service.in b/meta-openembedded/meta-oe/recipes-support/gpm/gpm/gpm.service.in index ee6c040fa6..5a6cadeb4e 100644 --- a/meta-openembedded/meta-oe/recipes-support/gpm/gpm/gpm.service.in +++ b/meta-openembedded/meta-oe/recipes-support/gpm/gpm/gpm.service.in @@ -4,6 +4,7 @@ Description=Virtual console mouse server [Service] Type=forking ExecStart=@bindir@/gpm -m /dev/input/mice -t imps2 +PIDFile=/run/gpm.pid [Install] WantedBy=multi-user.target diff --git a/meta-openembedded/meta-oe/recipes-support/gpm/gpm/no-docs.patch b/meta-openembedded/meta-oe/recipes-support/gpm/gpm/no-docs.patch deleted file mode 100644 index 3faef84ee2..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/gpm/gpm/no-docs.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# 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/meta-openembedded/meta-oe/recipes-support/gpm/gpm/processcreds.patch b/meta-openembedded/meta-oe/recipes-support/gpm/gpm/processcreds.patch deleted file mode 100644 index d647eca0ad..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/gpm/gpm/processcreds.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 <sys/socket.h> /* accept */ - #include <stdlib.h> /* malloc */ - #include <unistd.h> /* close */ diff --git a/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb index dcc9d68eaa..7034d33858 100644 --- a/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb @@ -1,6 +1,8 @@ +SUMMARY = "Console mouse driver" DESCRIPTION = "GPM (General Purpose Mouse) is a mouse server \ for the console and xterm, with sample clients included \ (emacs, etc)." +HOMEPAGE = "https://www.nico.schottelius.org/software/gpm" SECTION = "console/utils" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760" @@ -13,8 +15,6 @@ 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 \ " @@ -31,17 +31,10 @@ do_configure_prepend() { } 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 + install -d ${D}${systemd_system_unitdir} + sed 's:@bindir@:${sbindir}:' < ${WORKDIR}/gpm.service.in >${D}${systemd_system_unitdir}/gpm.service + install -D -m 0755 ${WORKDIR}/init ${D}${INIT_D_DIR}/gpm ln -s libgpm.so.2 ${D}${libdir}/libgpm.so } SYSTEMD_SERVICE_${PN} = "gpm.service" - -FILES_${PN} += "${datadir}/emacs" |