diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/meta-openembedded/meta-networking/recipes-support/chrony | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/meta-openembedded/meta-networking/recipes-support/chrony')
-rw-r--r-- | external/meta-openembedded/meta-networking/recipes-support/chrony/chrony/0001-Fix-compilation-with-musl.patch | 29 | ||||
-rw-r--r-- | external/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch | 33 | ||||
-rw-r--r-- | external/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.5.bb (renamed from external/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.3.bb) | 8 |
3 files changed, 53 insertions, 17 deletions
diff --git a/external/meta-openembedded/meta-networking/recipes-support/chrony/chrony/0001-Fix-compilation-with-musl.patch b/external/meta-openembedded/meta-networking/recipes-support/chrony/chrony/0001-Fix-compilation-with-musl.patch new file mode 100644 index 00000000..17b63535 --- /dev/null +++ b/external/meta-openembedded/meta-networking/recipes-support/chrony/chrony/0001-Fix-compilation-with-musl.patch @@ -0,0 +1,29 @@ +From 11ec10cdb5ab4b94c5999e018a9c854419997761 Mon Sep 17 00:00:00 2001 +From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> +Date: Wed, 10 Apr 2019 03:18:17 +0200 +Subject: [PATCH] Fix compilation with musl + +Fixes: +../hash_intmd5.c:58: undefined reference to `MIN' + +Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> +--- + hash_intmd5.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/hash_intmd5.c b/hash_intmd5.c +index 49da1cf..47efe4c 100644 +--- a/hash_intmd5.c ++++ b/hash_intmd5.c +@@ -33,6 +33,8 @@ + + #include "md5.c" + ++#include <sys/param.h> ++ + static MD5_CTX ctx; + + int +-- +2.17.1 + diff --git a/external/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch b/external/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch index 9f943cdc..187898a6 100644 --- a/external/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch +++ b/external/meta-openembedded/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch @@ -1,7 +1,7 @@ -From 9ca48a6fef1da1bb0dd67ab94256c7e240da1834 Mon Sep 17 00:00:00 2001 +From f35e07aceb4a16121d83b47ee77990018bec98ea Mon Sep 17 00:00:00 2001 From: Joe Slater <jslater@windriver.com> Date: Thu, 9 Mar 2017 10:58:06 -0800 -Subject: [PATCH] chrony: fix build failure for arma9 +Subject: [PATCH] chrony: fix build failure for arma9 Eliminate references to syscalls not available for ARM_EABI. Also add a dependency on libseccomp @@ -18,16 +18,15 @@ Subject: [PATCH] chrony: fix build failure for arma9 Refresh patch for new upstream version. Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> - --- - sys_linux.c | 19 +++++++++++++------ - 1 file changed, 13 insertions(+), 6 deletions(-) + sys_linux.c | 20 ++++++++++++++------ + 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/sys_linux.c b/sys_linux.c -index f4b532d..d05fa24 100644 +index 898dc7a..b268ad1 100644 --- a/sys_linux.c +++ b/sys_linux.c -@@ -482,14 +482,14 @@ SYS_Linux_EnableSystemCallFilter(int level) +@@ -479,14 +479,14 @@ SYS_Linux_EnableSystemCallFilter(int level) const int syscalls[] = { /* Clock */ SCMP_SYS(adjtimex), SCMP_SYS(clock_gettime), SCMP_SYS(gettimeofday), @@ -38,24 +37,24 @@ index f4b532d..d05fa24 100644 - SCMP_SYS(getrlimit), SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), + SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), SCMP_SYS(rt_sigprocmask), SCMP_SYS(set_tid_address), SCMP_SYS(sigreturn), - SCMP_SYS(wait4), + SCMP_SYS(wait4), SCMP_SYS(waitpid), /* Memory */ - SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap), SCMP_SYS(mmap2), + SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap2), SCMP_SYS(mprotect), SCMP_SYS(mremap), SCMP_SYS(munmap), SCMP_SYS(shmdt), /* Filesystem */ - SCMP_SYS(access), SCMP_SYS(chmod), SCMP_SYS(chown), SCMP_SYS(chown32), -@@ -500,14 +500,21 @@ SYS_Linux_EnableSystemCallFilter(int level) + SCMP_SYS(_llseek), SCMP_SYS(access), SCMP_SYS(chmod), SCMP_SYS(chown), +@@ -499,14 +499,22 @@ SYS_Linux_EnableSystemCallFilter(int level) SCMP_SYS(bind), SCMP_SYS(connect), SCMP_SYS(getsockname), SCMP_SYS(getsockopt), - SCMP_SYS(recvfrom), SCMP_SYS(recvmmsg), SCMP_SYS(recvmsg), - SCMP_SYS(sendmmsg), SCMP_SYS(sendmsg), SCMP_SYS(sendto), + SCMP_SYS(recv), SCMP_SYS(recvfrom), SCMP_SYS(recvmmsg), SCMP_SYS(recvmsg), + SCMP_SYS(send), SCMP_SYS(sendmmsg), SCMP_SYS(sendmsg), SCMP_SYS(sendto), - /* TODO: check socketcall arguments */ - SCMP_SYS(socketcall), /* General I/O */ SCMP_SYS(_newselect), SCMP_SYS(close), SCMP_SYS(open), SCMP_SYS(openat), SCMP_SYS(pipe), -- SCMP_SYS(poll), SCMP_SYS(read), SCMP_SYS(futex), SCMP_SYS(select), -+ SCMP_SYS(poll), SCMP_SYS(read), SCMP_SYS(futex), - SCMP_SYS(set_robust_list), SCMP_SYS(write), + SCMP_SYS(pipe2), SCMP_SYS(poll), SCMP_SYS(ppoll), SCMP_SYS(pselect6), SCMP_SYS(read), +- SCMP_SYS(futex), SCMP_SYS(select), SCMP_SYS(set_robust_list), SCMP_SYS(write), ++ SCMP_SYS(futex), SCMP_SYS(set_robust_list), SCMP_SYS(write), /* Miscellaneous */ SCMP_SYS(getrandom), SCMP_SYS(sysinfo), SCMP_SYS(uname), + /* not always available */ @@ -67,6 +66,10 @@ index f4b532d..d05fa24 100644 + /* TODO: check socketcall arguments */ + SCMP_SYS(socketcall), +#endif ++ }; const int socket_domains[] = { +-- +2.17.1 + diff --git a/external/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.3.bb b/external/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.5.bb index 2586370f..7c6356d2 100644 --- a/external/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.3.bb +++ b/external/meta-openembedded/meta-networking/recipes-support/chrony/chrony_3.5.bb @@ -35,8 +35,12 @@ SRC_URI = "https://download.tuxfamily.org/chrony/chrony-${PV}.tar.gz \ file://chronyd \ file://arm_eabi.patch \ " -SRC_URI[md5sum] = "81ab62cf5d60b4b3fa8cd2c1b267ffd9" -SRC_URI[sha256sum] = "0d1fb2d5875032f2d5a86f3770374c87ee4c941916f64171e81f7684f2a73128" + +SRC_URI_append_libc-musl = " \ + file://0001-Fix-compilation-with-musl.patch \ +" +SRC_URI[md5sum] = "5f66338bc940a9b51eede8f391e7bed3" +SRC_URI[sha256sum] = "4e02795b1260a4ec51e6ace84149036305cc9fc340e65edb9f8452aa611339b5" DEPENDS = "pps-tools" |