diff options
author | Changhyeok Bae <changhyeok.bae@gmail.com> | 2022-01-18 01:31:39 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-01-19 10:41:01 +0000 |
commit | 831626f8550b37ad2ec982616bf213635e22b368 (patch) | |
tree | a440c85e4e86a506f01656d33d7aa664537871d0 /meta/recipes-connectivity | |
parent | 6b746d75cfd8759272f83d844ea721bbcab0934e (diff) | |
download | poky-831626f8550b37ad2ec982616bf213635e22b368.tar.gz |
iproute2: update 5.15.0 to 5.16.0
0001-lib-fix-ax25.h-include-for-musl.patch is the fix for musl and comes
from upstream.
(From OE-Core rev: 01db27399073804b88a38beb0ecd4c151faf3471)
Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch | 37 | ||||
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_5.15.0.bb) | 3 |
2 files changed, 39 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch new file mode 100644 index 0000000000..e4c0cf4aa5 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2/0001-lib-fix-ax25.h-include-for-musl.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From 8bced38a941a181f1468fa39541e872e51b6022f Mon Sep 17 00:00:00 2001 | ||
2 | From: Sam James <sam@gentoo.org> | ||
3 | Date: Thu, 13 Jan 2022 08:14:13 +0000 | ||
4 | Subject: [PATCH] lib: fix ax25.h include for musl | ||
5 | |||
6 | ax25.h isn't guaranteed to be avilable in netax25/*; | ||
7 | it's dependent on our choice of libc (it's not available | ||
8 | on musl at least) [0]. | ||
9 | |||
10 | Let's use the version from linux-headers. | ||
11 | |||
12 | [0] https://sourceware.org/glibc/wiki/Synchronizing_Headers | ||
13 | Bug: https://bugs.gentoo.org/831102 | ||
14 | |||
15 | Signed-off-by: Sam James <sam@gentoo.org> | ||
16 | Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> | ||
17 | |||
18 | Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=8bced38a941a181f1468fa39541e872e51b6022f] | ||
19 | --- | ||
20 | lib/ax25_ntop.c | 2 +- | ||
21 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
22 | |||
23 | diff --git a/lib/ax25_ntop.c b/lib/ax25_ntop.c | ||
24 | index cfd0e04b..3a72a43e 100644 | ||
25 | --- a/lib/ax25_ntop.c | ||
26 | +++ b/lib/ax25_ntop.c | ||
27 | @@ -2,7 +2,7 @@ | ||
28 | |||
29 | #include <errno.h> | ||
30 | #include <sys/socket.h> | ||
31 | -#include <netax25/ax25.h> | ||
32 | +#include <linux/ax25.h> | ||
33 | |||
34 | #include "utils.h" | ||
35 | |||
36 | -- | ||
37 | 2.32.0 (Apple Git-132) | ||
diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.15.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb index 99a743391a..871f8d8fb7 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_5.15.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_5.16.0.bb | |||
@@ -2,9 +2,10 @@ require iproute2.inc | |||
2 | 2 | ||
3 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ | 3 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ |
4 | file://0001-libc-compat.h-add-musl-workaround.patch \ | 4 | file://0001-libc-compat.h-add-musl-workaround.patch \ |
5 | file://0001-lib-fix-ax25.h-include-for-musl.patch \ | ||
5 | " | 6 | " |
6 | 7 | ||
7 | SRC_URI[sha256sum] = "38e3e4a5f9a7f5575c015027a10df097c149111eeb739993128e5b2b35b291ff" | 8 | SRC_URI[sha256sum] = "c064b66f6b001c2a35aa5224b5b1ac8aa4bee104d7dce30d6f10a84cb8b01e2f" |
8 | 9 | ||
9 | # CFLAGS are computed in Makefile and reference CCOPTS | 10 | # CFLAGS are computed in Makefile and reference CCOPTS |
10 | # | 11 | # |