diff options
author | Wang Mingyu <wangmy@fujitsu.com> | 2022-09-05 17:02:06 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-09-05 15:58:34 -0700 |
commit | fca74376e140e33baa6d1ffc47e89a14761efb4c (patch) | |
tree | 7179c2182acdc374c565be980039ac7133505e20 /meta-networking | |
parent | c337aa1a02ef3cb6a9952d178e268d8684133410 (diff) | |
download | meta-openembedded-fca74376e140e33baa6d1ffc47e89a14761efb4c.tar.gz |
chrony: upgrade 4.2 -> 4.3
arm_eabi.patch
upgrade for 4.3
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-support/chrony/chrony/arm_eabi.patch | 18 | ||||
-rw-r--r-- | meta-networking/recipes-support/chrony/chrony_4.3.bb (renamed from meta-networking/recipes-support/chrony/chrony_4.2.bb) | 2 |
2 files changed, 9 insertions, 11 deletions
diff --git a/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch b/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch index 4a2769b84..5ba208126 100644 --- a/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch +++ b/meta-networking/recipes-support/chrony/chrony/arm_eabi.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f35e07aceb4a16121d83b47ee77990018bec98ea Mon Sep 17 00:00:00 2001 | 1 | From 28b9f115e36e2133301b02fa02ad71a8efbed9b9 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 |
@@ -22,12 +22,13 @@ Subject: [PATCH] chrony: fix build failure for arma9 | |||
22 | Refreshed for 4.0 | 22 | Refreshed for 4.0 |
23 | 23 | ||
24 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 24 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
25 | |||
25 | --- | 26 | --- |
26 | sys_linux.c | 15 +++++++++------ | 27 | sys_linux.c | 15 +++++++++------ |
27 | 1 file changed, 9 insertions(+), 6 deletions(-) | 28 | 1 file changed, 9 insertions(+), 6 deletions(-) |
28 | 29 | ||
29 | diff --git a/sys_linux.c b/sys_linux.c | 30 | diff --git a/sys_linux.c b/sys_linux.c |
30 | index 9cab2ef..8104b8f 100644 | 31 | index f2baab1..14a9241 100644 |
31 | --- a/sys_linux.c | 32 | --- a/sys_linux.c |
32 | +++ b/sys_linux.c | 33 | +++ b/sys_linux.c |
33 | @@ -484,7 +484,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) | 34 | @@ -484,7 +484,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) |
@@ -45,8 +46,8 @@ index 9cab2ef..8104b8f 100644 | |||
45 | - SCMP_SYS(getrlimit), | 46 | - SCMP_SYS(getrlimit), |
46 | SCMP_SYS(getuid), | 47 | SCMP_SYS(getuid), |
47 | SCMP_SYS(getuid32), | 48 | SCMP_SYS(getuid32), |
48 | SCMP_SYS(rt_sigaction), | 49 | #ifdef __NR_rseq |
49 | @@ -508,7 +506,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) | 50 | @@ -511,7 +509,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) |
50 | /* Memory */ | 51 | /* Memory */ |
51 | SCMP_SYS(brk), | 52 | SCMP_SYS(brk), |
52 | SCMP_SYS(madvise), | 53 | SCMP_SYS(madvise), |
@@ -54,7 +55,7 @@ index 9cab2ef..8104b8f 100644 | |||
54 | SCMP_SYS(mmap2), | 55 | SCMP_SYS(mmap2), |
55 | SCMP_SYS(mprotect), | 56 | SCMP_SYS(mprotect), |
56 | SCMP_SYS(mremap), | 57 | SCMP_SYS(mremap), |
57 | @@ -568,8 +565,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) | 58 | @@ -571,8 +568,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) |
58 | SCMP_SYS(sendmsg), | 59 | SCMP_SYS(sendmsg), |
59 | SCMP_SYS(sendto), | 60 | SCMP_SYS(sendto), |
60 | SCMP_SYS(shutdown), | 61 | SCMP_SYS(shutdown), |
@@ -63,7 +64,7 @@ index 9cab2ef..8104b8f 100644 | |||
63 | 64 | ||
64 | /* General I/O */ | 65 | /* General I/O */ |
65 | SCMP_SYS(_newselect), | 66 | SCMP_SYS(_newselect), |
66 | @@ -593,7 +588,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) | 67 | @@ -596,7 +591,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) |
67 | #ifdef __NR_futex_time64 | 68 | #ifdef __NR_futex_time64 |
68 | SCMP_SYS(futex_time64), | 69 | SCMP_SYS(futex_time64), |
69 | #endif | 70 | #endif |
@@ -71,7 +72,7 @@ index 9cab2ef..8104b8f 100644 | |||
71 | SCMP_SYS(set_robust_list), | 72 | SCMP_SYS(set_robust_list), |
72 | SCMP_SYS(write), | 73 | SCMP_SYS(write), |
73 | 74 | ||
74 | @@ -601,6 +595,15 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) | 75 | @@ -604,6 +598,15 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) |
75 | SCMP_SYS(getrandom), | 76 | SCMP_SYS(getrandom), |
76 | SCMP_SYS(sysinfo), | 77 | SCMP_SYS(sysinfo), |
77 | SCMP_SYS(uname), | 78 | SCMP_SYS(uname), |
@@ -87,6 +88,3 @@ index 9cab2ef..8104b8f 100644 | |||
87 | }; | 88 | }; |
88 | 89 | ||
89 | const int denied_any[] = { | 90 | const int denied_any[] = { |
90 | -- | ||
91 | 2.25.1 | ||
92 | |||
diff --git a/meta-networking/recipes-support/chrony/chrony_4.2.bb b/meta-networking/recipes-support/chrony/chrony_4.3.bb index 8ce9e1db5..083d2cbc0 100644 --- a/meta-networking/recipes-support/chrony/chrony_4.2.bb +++ b/meta-networking/recipes-support/chrony/chrony_4.3.bb | |||
@@ -39,7 +39,7 @@ 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 | SRC_URI[sha256sum] = "273f9fd15c328ed6f3a5f6ba6baec35a421a34a73bb725605329b1712048db9a" | 42 | SRC_URI[sha256sum] = "9d0da889a865f089a5a21610ffb6713e3c9438ce303a63b49c2fb6eaff5b8804" |
43 | 43 | ||
44 | DEPENDS = "pps-tools" | 44 | DEPENDS = "pps-tools" |
45 | 45 | ||