From 4feac920c221777ea4fb7a81821a35ea77c4b7c5 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 8 Aug 2022 08:42:04 +0200 Subject: iproute2: upgrade 5.18.0 -> 5.19.0 (From OE-Core rev: 00c40d1343dd34a416657b79745f102a17332ddb) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...ats.c-add-an-include-where-MIN-is-defined.patch | 25 ++++++++++++++++++++++ .../iproute2/iproute2_5.18.0.bb | 11 ---------- .../iproute2/iproute2_5.19.0.bb | 12 +++++++++++ 3 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-ip-ipstats.c-add-an-include-where-MIN-is-defined.patch delete mode 100644 meta/recipes-connectivity/iproute2/iproute2_5.18.0.bb create mode 100644 meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb (limited to 'meta/recipes-connectivity') diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-ip-ipstats.c-add-an-include-where-MIN-is-defined.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-ipstats.c-add-an-include-where-MIN-is-defined.patch new file mode 100644 index 0000000000..edd73818ba --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-ipstats.c-add-an-include-where-MIN-is-defined.patch @@ -0,0 +1,25 @@ +From c8a99f1035ec7b158a204f90e9a7ed3c0b1e3d52 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Fri, 5 Aug 2022 11:31:56 +0200 +Subject: [PATCH] ip/ipstats.c: add an include where MIN is defined + +Otherwise, non-glibc systems error out (e.g. on musl). + +Upstream-Status: Submitted [by email to stephen@networkplumber.org,netdev@vger.kernel.org] +Signed-off-by: Alexander Kanavin +--- + ip/ipstats.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/ip/ipstats.c b/ip/ipstats.c +index 5cdd15a..1ac275b 100644 +--- a/ip/ipstats.c ++++ b/ip/ipstats.c +@@ -1,6 +1,7 @@ + // SPDX-License-Identifier: GPL-2.0+ + #include + #include ++#include + + #include "list.h" + #include "utils.h" diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.18.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.18.0.bb deleted file mode 100644 index 3e01c70801..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2_5.18.0.bb +++ /dev/null @@ -1,11 +0,0 @@ -require iproute2.inc - -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ - file://0001-libc-compat.h-add-musl-workaround.patch \ - " - -SRC_URI[sha256sum] = "5ba3d464d51c8c283550d507ffac3d10f7aec587b7c66b0ccb6950643646389e" - -# CFLAGS are computed in Makefile and reference CCOPTS -# -EXTRA_OEMAKE:append = " CCOPTS='${CFLAGS}'" diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb new file mode 100644 index 0000000000..c45920b015 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2_5.19.0.bb @@ -0,0 +1,12 @@ +require iproute2.inc + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ + file://0001-libc-compat.h-add-musl-workaround.patch \ + file://0001-ip-ipstats.c-add-an-include-where-MIN-is-defined.patch \ + " + +SRC_URI[sha256sum] = "26b7a34d6a7fd2f7a42e2b39c5a90cb61bac522d1096067ffeb195e5693d7791" + +# CFLAGS are computed in Makefile and reference CCOPTS +# +EXTRA_OEMAKE:append = " CCOPTS='${CFLAGS}'" -- cgit v1.2.3-54-g00ecf