summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2018-09-07 00:06:43 -0700
committerKhem Raj <raj.khem@gmail.com>2018-09-09 10:46:29 -0700
commitd8560cb5e52bf1feeb769692004e4b20fad18d9b (patch)
treefea9e9898d789d5cc20e593551c227f1b435865f
parentd960c17f48e881d592269da3c2f3507fbcb345d5 (diff)
downloadmeta-openembedded-d8560cb5e52bf1feeb769692004e4b20fad18d9b.tar.gz
umip: Fetch from git.umip.org
* Adjust patches * Depend on openssl10 * remove spurious dep on rpm Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch21
-rw-r--r--meta-oe/recipes-connectivity/umip/umip_1.0.bb6
2 files changed, 8 insertions, 19 deletions
diff --git a/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch b/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch
index 8192056d1..153bced39 100644
--- a/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch
+++ b/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch
@@ -20,19 +20,11 @@ Upstream-Status: Pending
20 src/main.c | 5 +++-- 20 src/main.c | 5 +++--
21 1 file changed, 3 insertions(+), 2 deletions(-) 21 1 file changed, 3 insertions(+), 2 deletions(-)
22 22
23diff --git a/src/main.c b/src/main.c 23Index: git/src/main.c
24index 3cf4072..cd34196 100644 24===================================================================
25--- a/src/main.c 25--- git.orig/src/main.c
26+++ b/src/main.c 26+++ git/src/main.c
27@@ -31,6 +31,7 @@ 27@@ -133,9 +133,9 @@ static void daemon_start(int ignsigcld)
28 #include <sys/ioctl.h>
29 #include <sys/wait.h>
30 #include <sys/param.h>
31+#include <sys/types.h>
32 #include <pthread.h>
33 #include <fcntl.h>
34 #include <unistd.h>
35@@ -126,9 +127,9 @@ static void daemon_start(int ignsigcld)
36 28
37 if (ignsigcld) { 29 if (ignsigcld) {
38 #ifdef SIGTSTP 30 #ifdef SIGTSTP
@@ -44,6 +36,3 @@ index 3cf4072..cd34196 100644
44 #endif 36 #endif
45 } 37 }
46 } 38 }
47--
482.16.2
49
diff --git a/meta-oe/recipes-connectivity/umip/umip_1.0.bb b/meta-oe/recipes-connectivity/umip/umip_1.0.bb
index 8db252d23..cee44f6c7 100644
--- a/meta-oe/recipes-connectivity/umip/umip_1.0.bb
+++ b/meta-oe/recipes-connectivity/umip/umip_1.0.bb
@@ -7,9 +7,9 @@ HOMEPAGE = "http://umip.org/"
7SECTION = "System Environment/Base" 7SECTION = "System Environment/Base"
8LICENSE = "GPLv2" 8LICENSE = "GPLv2"
9LIC_FILES_CHKSUM = "file://COPYING;md5=073dc31ccb2ebed70db54f1e8aeb4c33" 9LIC_FILES_CHKSUM = "file://COPYING;md5=073dc31ccb2ebed70db54f1e8aeb4c33"
10DEPENDS = "rpm indent-native bison-native" 10DEPENDS = "openssl10 ipsec-tools radvd indent-native bison-native"
11 11
12SRC_URI = "git://github.com/jlanza/umip \ 12SRC_URI = "git://git.umip.org/umip/umip.git \
13 file://add-dependency-to-support-parallel-compilation.patch \ 13 file://add-dependency-to-support-parallel-compilation.patch \
14 file://mip6d \ 14 file://mip6d \
15 file://mip6d.service \ 15 file://mip6d.service \
@@ -17,7 +17,7 @@ SRC_URI = "git://github.com/jlanza/umip \
17 file://0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch \ 17 file://0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch \
18 file://0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch \ 18 file://0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch \
19 " 19 "
20SRCREV = "7d67209cd1bba2dd0e183a0fa07eeef07964dd14" 20SRCREV = "cbd441c5db719db554ff2b4fcb02fef88ae2f791"
21 21
22S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"
23 23