summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-08-11 22:42:13 -0700
committerKhem Raj <raj.khem@gmail.com>2020-08-11 23:37:47 -0700
commit4e04909323201952a9d83763d5aaa04f96c2e970 (patch)
treedc61fc16e88dd1fbe2009cdbe0cc87475471796d
parent6d4429f41f7d6221342eee180ad6ae49b8827396 (diff)
downloadmeta-openembedded-4e04909323201952a9d83763d5aaa04f96c2e970.tar.gz
gpm: Upgrade to latest master
Drop upstreamed patch Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch34
-rw-r--r--meta-oe/recipes-support/gpm/gpm_git.bb3
2 files changed, 1 insertions, 36 deletions
diff --git a/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch b/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch
deleted file mode 100644
index a9198166a9..0000000000
--- a/meta-oe/recipes-support/gpm/gpm/0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 52e6cf052b1f938fcca1bc24d578fe0bfd972988 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 25 Jun 2017 07:25:33 -0700
4Subject: [PATCH] Use sigemptyset API instead of __sigemptyset
5
6__sigemptyset has been removed from glibc public
7API headers in upcoming (2.26) release onwards
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Submitted
12
13 src/prog/gpm-root.y | 4 ----
14 1 file changed, 4 deletions(-)
15
16diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
17index 5126c65..76c896c 100644
18--- a/src/prog/gpm-root.y
19+++ b/src/prog/gpm-root.y
20@@ -1196,11 +1196,7 @@ int main(int argc, char **argv)
21 LOG_DAEMON : LOG_USER);
22 /* reap your zombies */
23 childaction.sa_handler=reap_children;
24-#if defined(__GLIBC__)
25- __sigemptyset(&childaction.sa_mask);
26-#else /* __GLIBC__ */
27 sigemptyset(&childaction.sa_mask);
28-#endif /* __GLIBC__ */
29 childaction.sa_flags=0;
30 sigaction(SIGCHLD,&childaction,NULL);
31
32--
332.13.1
34
diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb
index 3800d147f9..600b25df86 100644
--- a/meta-oe/recipes-support/gpm/gpm_git.bb
+++ b/meta-oe/recipes-support/gpm/gpm_git.bb
@@ -9,14 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760"
9 9
10PV = "1.99.7+git${SRCREV}" 10PV = "1.99.7+git${SRCREV}"
11PR = "r2" 11PR = "r2"
12SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77" 12SRCREV = "e82d1a653ca94aa4ed12441424da6ce780b1e530"
13 13
14DEPENDS = "ncurses bison-native" 14DEPENDS = "ncurses bison-native"
15 15
16SRC_URI = "git://github.com/telmich/gpm;protocol=git \ 16SRC_URI = "git://github.com/telmich/gpm;protocol=git \
17 file://init \ 17 file://init \
18 file://gpm.service.in \ 18 file://gpm.service.in \
19 file://0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch \
20 " 19 "
21 20
22S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"