diff options
| author | Christian Poessinger <christian@poessinger.com> | 2022-09-13 09:25:02 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2022-09-13 09:25:02 +0200 |
| commit | f9db3f30d1805258caa81111e037e25b1099a4ea (patch) | |
| tree | 45c4f958221d625f97cf07b3e28236c1938a6b3c | |
| parent | 911960db4b22ee1d0dec9316f5d8234d8b80ffc1 (diff) | |
| download | vyos-build-f9db3f30d1805258caa81111e037e25b1099a4ea.tar.gz vyos-build-f9db3f30d1805258caa81111e037e25b1099a4ea.zip | |
iproute2: T4691: upgrade version to match 5.15 kernel tree
| -rw-r--r-- | packages/iproute2/Jenkinsfile | 2 | ||||
| -rw-r--r-- | packages/iproute2/patches/0001-erspan-erspan6-fix-JSON-output.patch | 56 |
2 files changed, 1 insertions, 57 deletions
diff --git a/packages/iproute2/Jenkinsfile b/packages/iproute2/Jenkinsfile index ce89aead..8f8a5c14 100644 --- a/packages/iproute2/Jenkinsfile +++ b/packages/iproute2/Jenkinsfile @@ -23,7 +23,7 @@ // and not via a DEB package def pkgList = [ ['name': 'iproute2', - 'scmCommit': 'debian/5.10.0-4_bpo10+1', + 'scmCommit': 'debian/5.15.0-1_bpo11+1', 'scmUrl': 'https://salsa.debian.org/debian/iproute2', 'buildCmd': 'cd ..; ./build.sh'], ] diff --git a/packages/iproute2/patches/0001-erspan-erspan6-fix-JSON-output.patch b/packages/iproute2/patches/0001-erspan-erspan6-fix-JSON-output.patch deleted file mode 100644 index e21c13c0..00000000 --- a/packages/iproute2/patches/0001-erspan-erspan6-fix-JSON-output.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 50d6a22e0c1368bcc662bbfea75ce21378825b0d Mon Sep 17 00:00:00 2001 -From: Christian Poessinger <christian@poessinger.com> -Date: Fri, 9 Apr 2021 12:45:00 +0200 -Subject: [PATCH] erspan/erspan6: fix JSON output - -The format for erspan/erspan6 output is not valid JSON, as on version 2 a -valueless key was presented. The direction should be value and erspan_dir -should be the key. - -Fixes: 289763626721 ("erspan: add erspan version II support") -Cc: u9012063@gmail.com -Cc: Stephen Hemminger <stephen@networkplumber.org> -Reported-by: Christian Poessinger <christian@poessinger.com> -Signed-off-by: Christian Poessinger <christian@poessinger.com> ---- - ip/link_gre.c | 4 ++-- - ip/link_gre6.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/ip/link_gre.c b/ip/link_gre.c -index 0461e5d0..6d4a8be8 100644 ---- a/ip/link_gre.c -+++ b/ip/link_gre.c -@@ -536,10 +536,10 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) - - if (erspan_dir == 0) - print_string(PRINT_ANY, "erspan_dir", -- "erspan_dir ingress ", NULL); -+ "erspan_dir %s ", "ingress"); - else - print_string(PRINT_ANY, "erspan_dir", -- "erspan_dir egress ", NULL); -+ "erspan_dir %s ", "egress"); - } - - if (tb[IFLA_GRE_ERSPAN_HWID]) { -diff --git a/ip/link_gre6.c b/ip/link_gre6.c -index 9d270f4b..f33598af 100644 ---- a/ip/link_gre6.c -+++ b/ip/link_gre6.c -@@ -594,10 +594,10 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) - - if (erspan_dir == 0) - print_string(PRINT_ANY, "erspan_dir", -- "erspan_dir ingress ", NULL); -+ "erspan_dir %s ", "ingress"); - else - print_string(PRINT_ANY, "erspan_dir", -- "erspan_dir egress ", NULL); -+ "erspan_dir %s ", "egress"); - } - - if (tb[IFLA_GRE_ERSPAN_HWID]) { --- -2.20.1 - |