diff options
Diffstat (limited to 'meta-networking/recipes-support')
-rw-r--r-- | meta-networking/recipes-support/chrony/chrony/arm_eabi.patch | 33 | ||||
-rw-r--r-- | meta-networking/recipes-support/chrony/chrony_3.5.bb (renamed from meta-networking/recipes-support/chrony/chrony_3.4.bb) | 5 |
2 files changed, 20 insertions, 18 deletions
diff --git a/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch b/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch index 9f943cdce..187898a6e 100644 --- a/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch +++ b/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 9ca48a6fef1da1bb0dd67ab94256c7e240da1834 Mon Sep 17 00:00:00 2001 | 1 | From f35e07aceb4a16121d83b47ee77990018bec98ea Mon Sep 17 00:00:00 2001 |
2 | From: Joe Slater <jslater@windriver.com> | 2 | From: Joe Slater <jslater@windriver.com> |
3 | Date: Thu, 9 Mar 2017 10:58:06 -0800 | 3 | Date: Thu, 9 Mar 2017 10:58:06 -0800 |
4 | Subject: [PATCH] chrony: fix build failure for arma9 | 4 | Subject: [PATCH] chrony: fix build failure for arma9 |
5 | 5 | ||
6 | Eliminate references to syscalls not available | 6 | Eliminate references to syscalls not available |
7 | for ARM_EABI. Also add a dependency on libseccomp | 7 | for ARM_EABI. Also add a dependency on libseccomp |
@@ -18,16 +18,15 @@ Subject: [PATCH] chrony: fix build failure for arma9 | |||
18 | Refresh patch for new upstream version. | 18 | Refresh patch for new upstream version. |
19 | 19 | ||
20 | Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> | 20 | Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> |
21 | |||
22 | --- | 21 | --- |
23 | sys_linux.c | 19 +++++++++++++------ | 22 | sys_linux.c | 20 ++++++++++++++------ |
24 | 1 file changed, 13 insertions(+), 6 deletions(-) | 23 | 1 file changed, 14 insertions(+), 6 deletions(-) |
25 | 24 | ||
26 | diff --git a/sys_linux.c b/sys_linux.c | 25 | diff --git a/sys_linux.c b/sys_linux.c |
27 | index f4b532d..d05fa24 100644 | 26 | index 898dc7a..b268ad1 100644 |
28 | --- a/sys_linux.c | 27 | --- a/sys_linux.c |
29 | +++ b/sys_linux.c | 28 | +++ b/sys_linux.c |
30 | @@ -482,14 +482,14 @@ SYS_Linux_EnableSystemCallFilter(int level) | 29 | @@ -479,14 +479,14 @@ SYS_Linux_EnableSystemCallFilter(int level) |
31 | const int syscalls[] = { | 30 | const int syscalls[] = { |
32 | /* Clock */ | 31 | /* Clock */ |
33 | SCMP_SYS(adjtimex), SCMP_SYS(clock_gettime), SCMP_SYS(gettimeofday), | 32 | SCMP_SYS(adjtimex), SCMP_SYS(clock_gettime), SCMP_SYS(gettimeofday), |
@@ -38,24 +37,24 @@ index f4b532d..d05fa24 100644 | |||
38 | - SCMP_SYS(getrlimit), SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), | 37 | - SCMP_SYS(getrlimit), SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), |
39 | + SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), | 38 | + SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), |
40 | SCMP_SYS(rt_sigprocmask), SCMP_SYS(set_tid_address), SCMP_SYS(sigreturn), | 39 | SCMP_SYS(rt_sigprocmask), SCMP_SYS(set_tid_address), SCMP_SYS(sigreturn), |
41 | SCMP_SYS(wait4), | 40 | SCMP_SYS(wait4), SCMP_SYS(waitpid), |
42 | /* Memory */ | 41 | /* Memory */ |
43 | - SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap), SCMP_SYS(mmap2), | 42 | - SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap), SCMP_SYS(mmap2), |
44 | + SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap2), | 43 | + SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap2), |
45 | SCMP_SYS(mprotect), SCMP_SYS(mremap), SCMP_SYS(munmap), SCMP_SYS(shmdt), | 44 | SCMP_SYS(mprotect), SCMP_SYS(mremap), SCMP_SYS(munmap), SCMP_SYS(shmdt), |
46 | /* Filesystem */ | 45 | /* Filesystem */ |
47 | SCMP_SYS(access), SCMP_SYS(chmod), SCMP_SYS(chown), SCMP_SYS(chown32), | 46 | SCMP_SYS(_llseek), SCMP_SYS(access), SCMP_SYS(chmod), SCMP_SYS(chown), |
48 | @@ -500,14 +500,21 @@ SYS_Linux_EnableSystemCallFilter(int level) | 47 | @@ -499,14 +499,22 @@ SYS_Linux_EnableSystemCallFilter(int level) |
49 | SCMP_SYS(bind), SCMP_SYS(connect), SCMP_SYS(getsockname), SCMP_SYS(getsockopt), | 48 | SCMP_SYS(bind), SCMP_SYS(connect), SCMP_SYS(getsockname), SCMP_SYS(getsockopt), |
50 | SCMP_SYS(recvfrom), SCMP_SYS(recvmmsg), SCMP_SYS(recvmsg), | 49 | SCMP_SYS(recv), SCMP_SYS(recvfrom), SCMP_SYS(recvmmsg), SCMP_SYS(recvmsg), |
51 | SCMP_SYS(sendmmsg), SCMP_SYS(sendmsg), SCMP_SYS(sendto), | 50 | SCMP_SYS(send), SCMP_SYS(sendmmsg), SCMP_SYS(sendmsg), SCMP_SYS(sendto), |
52 | - /* TODO: check socketcall arguments */ | 51 | - /* TODO: check socketcall arguments */ |
53 | - SCMP_SYS(socketcall), | 52 | - SCMP_SYS(socketcall), |
54 | /* General I/O */ | 53 | /* General I/O */ |
55 | SCMP_SYS(_newselect), SCMP_SYS(close), SCMP_SYS(open), SCMP_SYS(openat), SCMP_SYS(pipe), | 54 | SCMP_SYS(_newselect), SCMP_SYS(close), SCMP_SYS(open), SCMP_SYS(openat), SCMP_SYS(pipe), |
56 | - SCMP_SYS(poll), SCMP_SYS(read), SCMP_SYS(futex), SCMP_SYS(select), | 55 | SCMP_SYS(pipe2), SCMP_SYS(poll), SCMP_SYS(ppoll), SCMP_SYS(pselect6), SCMP_SYS(read), |
57 | + SCMP_SYS(poll), SCMP_SYS(read), SCMP_SYS(futex), | 56 | - SCMP_SYS(futex), SCMP_SYS(select), SCMP_SYS(set_robust_list), SCMP_SYS(write), |
58 | SCMP_SYS(set_robust_list), SCMP_SYS(write), | 57 | + SCMP_SYS(futex), SCMP_SYS(set_robust_list), SCMP_SYS(write), |
59 | /* Miscellaneous */ | 58 | /* Miscellaneous */ |
60 | SCMP_SYS(getrandom), SCMP_SYS(sysinfo), SCMP_SYS(uname), | 59 | SCMP_SYS(getrandom), SCMP_SYS(sysinfo), SCMP_SYS(uname), |
61 | + /* not always available */ | 60 | + /* not always available */ |
@@ -67,6 +66,10 @@ index f4b532d..d05fa24 100644 | |||
67 | + /* TODO: check socketcall arguments */ | 66 | + /* TODO: check socketcall arguments */ |
68 | + SCMP_SYS(socketcall), | 67 | + SCMP_SYS(socketcall), |
69 | +#endif | 68 | +#endif |
69 | + | ||
70 | }; | 70 | }; |
71 | 71 | ||
72 | const int socket_domains[] = { | 72 | const int socket_domains[] = { |
73 | -- | ||
74 | 2.17.1 | ||
75 | |||
diff --git a/meta-networking/recipes-support/chrony/chrony_3.4.bb b/meta-networking/recipes-support/chrony/chrony_3.5.bb index f6898c0b7..7c6356d26 100644 --- a/meta-networking/recipes-support/chrony/chrony_3.4.bb +++ b/meta-networking/recipes-support/chrony/chrony_3.5.bb | |||
@@ -39,9 +39,8 @@ SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \ | |||
39 | SRC_URI_append_libc-musl = " \ | 39 | SRC_URI_append_libc-musl = " \ |
40 | file://0001-Fix-compilation-with-musl.patch \ | 40 | file://0001-Fix-compilation-with-musl.patch \ |
41 | " | 41 | " |
42 | 42 | SRC_URI[md5sum] = "5f66338bc940a9b51eede8f391e7bed3" | |
43 | SRC_URI[md5sum] = "7170e750469c198fc6784047d6f71144" | 43 | SRC_URI[sha256sum] = "4e02795b1260a4ec51e6ace84149036305cc9fc340e65edb9f8452aa611339b5" |
44 | SRC_URI[sha256sum] = "af77e47c2610a7e55c8af5b89a8aeff52d9a867dd5983d848b52d374bc0e6b9f" | ||
45 | 44 | ||
46 | DEPENDS = "pps-tools" | 45 | DEPENDS = "pps-tools" |
47 | 46 | ||