diff options
-rw-r--r-- | meta/recipes-support/gnutls/gnutls/arm_eabi.patch | 15 | ||||
-rw-r--r-- | meta/recipes-support/gnutls/gnutls_3.7.0.bb (renamed from meta/recipes-support/gnutls/gnutls_3.6.15.bb) | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch index 34c8985c19..6eb1edbdb1 100644 --- a/meta/recipes-support/gnutls/gnutls/arm_eabi.patch +++ b/meta/recipes-support/gnutls/gnutls/arm_eabi.patch | |||
@@ -1,3 +1,8 @@ | |||
1 | From 8a5c96057cf305bbeac0d6e0e59ee24fbb9497fe Mon Sep 17 00:00:00 2001 | ||
2 | From: Joe Slater <jslater@windriver.com> | ||
3 | Date: Wed, 25 Jan 2017 13:52:59 -0800 | ||
4 | Subject: [PATCH] gnutls: account for ARM_EABI | ||
5 | |||
1 | Certain syscall's are not availabe for arm-eabi, so we eliminate | 6 | Certain syscall's are not availabe for arm-eabi, so we eliminate |
2 | reference to them. | 7 | reference to them. |
3 | 8 | ||
@@ -5,12 +10,18 @@ Upstream-Status: Pending | |||
5 | 10 | ||
6 | Signed-off-by: Joe Slater <jslater@windriver.com> | 11 | Signed-off-by: Joe Slater <jslater@windriver.com> |
7 | 12 | ||
13 | --- | ||
14 | tests/seccomp.c | 2 ++ | ||
15 | 1 file changed, 2 insertions(+) | ||
16 | |||
17 | diff --git a/tests/seccomp.c b/tests/seccomp.c | ||
18 | index ed14d00..3c5b726 100644 | ||
8 | --- a/tests/seccomp.c | 19 | --- a/tests/seccomp.c |
9 | +++ b/tests/seccomp.c | 20 | +++ b/tests/seccomp.c |
10 | @@ -49,7 +49,9 @@ int disable_system_calls(void) | 21 | @@ -53,7 +53,9 @@ int disable_system_calls(void) |
11 | } | ||
12 | 22 | ||
13 | ADD_SYSCALL(nanosleep, 0); | 23 | ADD_SYSCALL(nanosleep, 0); |
24 | ADD_SYSCALL(clock_nanosleep, 0); | ||
14 | +#if ! defined(__ARM_EABI__) | 25 | +#if ! defined(__ARM_EABI__) |
15 | ADD_SYSCALL(time, 0); | 26 | ADD_SYSCALL(time, 0); |
16 | +#endif | 27 | +#endif |
diff --git a/meta/recipes-support/gnutls/gnutls_3.6.15.bb b/meta/recipes-support/gnutls/gnutls_3.7.0.bb index b936db50d1..e3ca86b933 100644 --- a/meta/recipes-support/gnutls/gnutls_3.6.15.bb +++ b/meta/recipes-support/gnutls/gnutls_3.7.0.bb | |||
@@ -21,7 +21,7 @@ SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar | |||
21 | file://arm_eabi.patch \ | 21 | file://arm_eabi.patch \ |
22 | " | 22 | " |
23 | 23 | ||
24 | SRC_URI[sha256sum] = "0ea8c3283de8d8335d7ae338ef27c53a916f15f382753b174c18b45ffd481558" | 24 | SRC_URI[sha256sum] = "49e2a22691d252c9f24a9829b293a8f359095bc5a818351f05f1c0a5188a1df8" |
25 | 25 | ||
26 | inherit autotools texinfo pkgconfig gettext lib_package gtk-doc | 26 | inherit autotools texinfo pkgconfig gettext lib_package gtk-doc |
27 | 27 | ||