[meta-oe][PATCH 1/5] gpm: Fix gpm path in unit file

[meta-oe][PATCH 1/5] gpm: Fix gpm path in unit file

[Robert Joslyn]

The binary is installed to ${sbindir}, but the unit file used ${bindir}.

Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
---
 meta-oe/recipes-support/gpm/gpm_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb
index dcc9d68ea..fa0307038 100644
--- a/meta-oe/recipes-support/gpm/gpm_git.bb
+++ b/meta-oe/recipes-support/gpm/gpm_git.bb
@@ -33,7 +33,7 @@ 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
+        sed 's:@bindir@:${sbindir}:' < ${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
-- 
2.21.0

[meta-oe][PATCH 2/5] gpm: Add PID file to systemd unit file

[Robert Joslyn]

This helps systemd identify the main process of the service.

Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
---
 meta-oe/recipes-support/gpm/gpm/gpm.service.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-support/gpm/gpm/gpm.service.in b/meta-oe/recipes-support/gpm/gpm/gpm.service.in
index ee6c040fa..5a6cadeb4 100644
--- a/meta-oe/recipes-support/gpm/gpm/gpm.service.in
+++ b/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
-- 
2.21.0

[meta-oe][PATCH 3/5] gpm: Generate documentation

[Robert Joslyn]

Remove patch disabling documentation, since it builds and is packaged
properly.

Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
---
 meta-oe/recipes-support/gpm/gpm/no-docs.patch | 18 ------------------
 meta-oe/recipes-support/gpm/gpm_git.bb        |  1 -
 2 files changed, 19 deletions(-)
 delete mode 100644 meta-oe/recipes-support/gpm/gpm/no-docs.patch

diff --git a/meta-oe/recipes-support/gpm/gpm/no-docs.patch b/meta-oe/recipes-support/gpm/gpm/no-docs.patch
deleted file mode 100644
index 3faef84ee..000000000
--- a/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-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb
index fa0307038..012dceb23 100644
--- a/meta-oe/recipes-support/gpm/gpm_git.bb
+++ b/meta-oe/recipes-support/gpm/gpm_git.bb
@@ -13,7 +13,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 \
-- 
2.21.0

[meta-oe][PATCH 4/5] gpm: Remove duplicate definition of _GNU_SOURCE

[Robert Joslyn]

The Makefile already sets -D_GNU_SOURCE in CPPFLAGS, no need to patch it
in again.

Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
---
 meta-oe/recipes-support/gpm/gpm/processcreds.patch | 12 ------------
 meta-oe/recipes-support/gpm/gpm_git.bb             |  1 -
 2 files changed, 13 deletions(-)
 delete mode 100644 meta-oe/recipes-support/gpm/gpm/processcreds.patch

diff --git a/meta-oe/recipes-support/gpm/gpm/processcreds.patch b/meta-oe/recipes-support/gpm/gpm/processcreds.patch
deleted file mode 100644
index d647eca0a..000000000
--- a/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-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb
index 012dceb23..b64f05c57 100644
--- a/meta-oe/recipes-support/gpm/gpm_git.bb
+++ b/meta-oe/recipes-support/gpm/gpm_git.bb
@@ -13,7 +13,6 @@ DEPENDS = "ncurses bison-native"
 
 SRC_URI = "git://github.com/telmich/gpm;protocol=git \
            file://init \
-           file://processcreds.patch \
            file://gpm.service.in \
            file://0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch \
            "
-- 
2.21.0

[meta-oe][PATCH 5/5] gpm: Recipe cleanup

[Robert Joslyn]

* Add SUMMARY and HOMEPAGE
* Remove unnecessary FILES line, as the specified directory does not
  exist
* Remove unnecessary conditional placement of init script and systemd
  unit file. The update-rc.d and systemd classes handle packaging of
  these files.

Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
---
 meta-oe/recipes-support/gpm/gpm_git.bb | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb
index b64f05c57..7034d3385 100644
--- a/meta-oe/recipes-support/gpm/gpm_git.bb
+++ b/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"
@@ -29,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@:${sbindir}:' < ${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"
-- 
2.21.0

Re: [meta-oe][PATCH 4/5] gpm: Remove duplicate definition of _GNU_SOURCE

[Khem Raj]

On Sun, Apr 14, 2019 at 11:09 AM Robert Joslyn <
robert.joslyn@redrectangle.org> wrote:

> The Makefile already sets -D_GNU_SOURCE in CPPFLAGS, no need to patch it
> in again.


Have you build tested it with musl ?

>
>
> Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
> ---
>  meta-oe/recipes-support/gpm/gpm/processcreds.patch | 12 ------------
>  meta-oe/recipes-support/gpm/gpm_git.bb             |  1 -
>  2 files changed, 13 deletions(-)
>  delete mode 100644 meta-oe/recipes-support/gpm/gpm/processcreds.patch
>
> diff --git a/meta-oe/recipes-support/gpm/gpm/processcreds.patch
> b/meta-oe/recipes-support/gpm/gpm/processcreds.patch
> deleted file mode 100644
> index d647eca0a..000000000
> --- a/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-oe/recipes-support/gpm/gpm_git.bb
> b/meta-oe/recipes-support/gpm/gpm_git.bb
> index 012dceb23..b64f05c57 100644
> --- a/meta-oe/recipes-support/gpm/gpm_git.bb
> +++ b/meta-oe/recipes-support/gpm/gpm_git.bb
> @@ -13,7 +13,6 @@ DEPENDS = "ncurses bison-native"
>
>  SRC_URI = "git://github.com/telmich/gpm;protocol=git \
>             file://init \
> -           file://processcreds.patch \
>             file://gpm.service.in \
>             file://0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch
> \
>             "
> --
> 2.21.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>

Re: [meta-oe][PATCH 4/5] gpm: Remove duplicate definition of _GNU_SOURCE

[Robert Joslyn]

On Sun, 2019-04-14 at 11:15 -0700, Khem Raj wrote:
> 
> 
> On Sun, Apr 14, 2019 at 11:09 AM Robert Joslyn <
> robert.joslyn@redrectangle.org> wrote:
> > The Makefile already sets -D_GNU_SOURCE in CPPFLAGS, no need to
> > patch it
> > in again.
> 
> Have you build tested it with musl ?

Yes, this builds with musl, but I have not run tested. I can throw a
musl build on a board tomorrow to make sure it runs on hardware.

Thanks,
Robert

Re: [meta-oe][PATCH 4/5] gpm: Remove duplicate definition of _GNU_SOURCE

[Robert Joslyn]

On Sun, 2019-04-14 at 11:15 -0700, Khem Raj wrote:
> 
> 
> On Sun, Apr 14, 2019 at 11:09 AM Robert Joslyn <
> robert.joslyn@redrectangle.org> wrote:
> > The Makefile already sets -D_GNU_SOURCE in CPPFLAGS, no need to
> > patch it
> > in again.
> 
> Have you build tested it with musl ?

Was able to do a musl build and confirmed it builds and runs on my x86
boards.

Thanks,
Robert

Re: [meta-oe][PATCH 4/5] gpm: Remove duplicate definition of _GNU_SOURCE

[Khem Raj]

On Mon, Apr 15, 2019 at 8:37 PM Robert Joslyn <
robert.joslyn@redrectangle.org> wrote:

> On Sun, 2019-04-14 at 11:15 -0700, Khem Raj wrote:
> >
> >
> > On Sun, Apr 14, 2019 at 11:09 AM Robert Joslyn <
> > robert.joslyn@redrectangle.org> wrote:
> > > The Makefile already sets -D_GNU_SOURCE in CPPFLAGS, no need to
> > > patch it
> > > in again.
> >
> > Have you build tested it with musl ?
>
> Was able to do a musl build and confirmed it builds and runs on my x86
> boards.
>

Thanks


> Thanks,
> Robert
>
>