mirror of
https://git.yoctoproject.org/poky
synced 2026-05-01 06:32:11 +02:00
iproute2: upgrade 5.19.0 -> 6.0.0
Two patches are in upstream. (From OE-Core rev: 9acd3f210f63156d5fd9acbf4477aef2bb4c9de8) Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
756e940f15
commit
eff3042f0e
@@ -1,28 +0,0 @@
|
||||
From dc837a6b4c2cad7f31cddfe56cd652e26baadc02 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 10 Aug 2022 22:31:03 -0700
|
||||
Subject: [PATCH] configure: Define _GNU_SOURCE when checking for setns
|
||||
|
||||
glibc defines this function only as gnu extention
|
||||
|
||||
Upstream-Status: Submitted [https://lore.kernel.org/netdev/20220811053440.778649-1-raj.khem@gmail.com/T/#u]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
configure | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 440facb..c02753b 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -191,6 +191,7 @@ check_ipt_lib_dir()
|
||||
check_setns()
|
||||
{
|
||||
cat >$TMPDIR/setnstest.c <<EOF
|
||||
+#define _GNU_SOURCE
|
||||
#include <sched.h>
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
--
|
||||
2.37.1
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
From c8a99f1035ec7b158a204f90e9a7ed3c0b1e3d52 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex@linutronix.de>
|
||||
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 <alex@linutronix.de>
|
||||
---
|
||||
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 <assert.h>
|
||||
#include <errno.h>
|
||||
+#include <sys/param.h>
|
||||
|
||||
#include "list.h"
|
||||
#include "utils.h"
|
||||
@@ -13,11 +13,9 @@ DEPENDS = "flex-native bison-native iptables libcap"
|
||||
|
||||
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 \
|
||||
file://0001-configure-Define-_GNU_SOURCE-when-checking-for-setns.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "26b7a34d6a7fd2f7a42e2b39c5a90cb61bac522d1096067ffeb195e5693d7791"
|
||||
SRC_URI[sha256sum] = "523139e9e72aec996374fa2de74be4c53d2dd05589488934d21ff97bae19580a"
|
||||
|
||||
inherit update-alternatives bash-completion pkgconfig
|
||||
|
||||
Reference in New Issue
Block a user