iproute2: fix build with uclibc-ng
PATCH 1/1 iproute2: fix build with uclibc-ng
ublibc-ng does not provide PF_VSOCK/AF_VSOCK definitions. Add them locally until ucblibc-ng updates its headers.
Fixes:
http://autobuild.buildroot.net/results/3d5/3d5a29e3c61ff071628c2937844ea4156059b3dd/
--- ...s-add-local-PF_VSOCK-AF_VSOCK-definitions.patch | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 package/iproute2/0002-ss-add-local-PF_VSOCK-AF_VSOCK-definitions.patch
package/iproute2/0002-ss-add-local-PF_VSOCK-AF_VSOCK-definitions.patch new file +58 -0
@@ -0,0 +1,58 @@ +From ca5562864f3c45557ee96a6fd6036150066c6b58 Mon Sep 17 00:00:00 2001 +From: Baruch Siach <[email protected]> +Date: Thu, 15 Feb 2018 07:39:52 +0200 +Subject: [PATCH] ss: add local PF_VSOCK/AF_VSOCK definitions + +uclibc-ng does not provide these definitions yet. Add them locally to +fix the build. + +Increase AF_MAX to cover AF_VSOCK. + +Signed-off-by: Baruch Siach <[email protected]> +--- +Upstream status: not upstreamable. uclibc-ng needs to update its Linux +socket.h. +--- + misc/ss.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/misc/ss.c b/misc/ss.c +index 29a250704c2d..b3f289ae358e 100644 +--- a/misc/ss.c ++++ b/misc/ss.c +@@ -50,6 +50,14 @@ + #define BUF_CHUNK (1024 * 1024) + #define LEN_ALIGN(x) (((x) + 1) & ~1) + ++#ifndef PF_VSOCK ++#define PF_VSOCK 40 ++#endif ++ ++#ifndef AF_VSOCK ++#define AF_VSOCK PF_VSOCK ++#endif ++ + #define DIAG_REQUEST(_req, _r) \ + struct { \ + struct nlmsghdr nlh; \ +@@ -298,7 +306,7 @@ static const struct filter default_dbs[MAX_DB] = { + }, + }; + +-static const struct filter default_afs[AF_MAX] = { ++static const struct filter default_afs[AF_MAX+1] = { + [AF_INET] = { + .dbs = INET_DBM, + .states = SS_CONN, +@@ -383,7 +391,7 @@ static void filter_merge_defaults(struct filter *f) + if (!(default_dbs[db].families & f->families)) + f->families |= default_dbs[db].families; + } +- for (af = 0; af < AF_MAX; af++) { ++ for (af = 0; af < AF_MAX+1; af++) { + if (!(f->families & FAMILY_MASK(af))) + continue; + +-- +2.15.1 +
Signature · 1 line
2.15.1
PATCH 1/1 iproute2: fix build with uclibc-ng
Hello,
Quoted 9 lines · Baruch Siach
ublibc-ng does not provide PF_VSOCK/AF_VSOCK definitions. Add them locally until ucblibc-ng updates its headers.
Fixes:
http://autobuild.buildroot.net/results/3d5/3d5a29e3c61ff071628c2937844ea4156059b3dd/Cc Petr Vorel <[email protected]>Cc Waldemar Brodkorb <[email protected]>Signed-off-by Baruch Siach <[email protected]>
Is this a fallout from:
65a7e82c891e967c4dd96678be72b8acf16a0127 iproute2: bump to version 4.15.0
i.e, is this patch for next, or master ? The autobuilder failure you pointed is on the next branch, so I assume that this patch is for next, but you didn't made it explicit.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering http://bootlin.com
PATCH 1/1 iproute2: fix build with uclibc-ng
Hi Thomas,
Quoted 11 lines · Thomas Petazzoni
Quoted 9 lines · Baruch Siach
ublibc-ng does not provide PF_VSOCK/AF_VSOCK definitions. Add them locally until ucblibc-ng updates its headers.
Fixes:
http://autobuild.buildroot.net/results/3d5/3d5a29e3c61ff071628c2937844ea4156059b3dd/Cc Petr Vorel <[email protected]>Cc Waldemar Brodkorb <[email protected]>Signed-off-by Baruch Siach <[email protected]>
Quoted 7 lines
Is this a fallout from:
65a7e82c891e967c4dd96678be72b8acf16a0127iproute2: bump to version 4.15.0i.e, is this patch for next, or master ? The autobuilder failure you pointed is on the next branch, so I assume that this patch is for next, but you didn't made it explicit.
This patch is for next. The 4.15.0 release added a reference to AF_VSOCK. Sorry for not being explicit about the target branch.
baruch
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -Thomas Petazzoni
AppliedPATCH 1/1 iproute2: fix build with uclibc-ng
In reply to Baruch SiachHello,
Quoted 6 lines · Baruch Siach
ublibc-ng does not provide PF_VSOCK/AF_VSOCK definitions. Add them locally until ucblibc-ng updates its headers.
Fixes:
http://autobuild.buildroot.net/results/3d5/3d5a29e3c61ff071628c2937844ea4156059b3dd/
Quoted 7 lines
Cc Petr Vorel <[email protected]>Cc Waldemar Brodkorb <[email protected]>Signed-off-by Baruch Siach <[email protected]>--- ...s-add-local-PF_VSOCK-AF_VSOCK-definitions.patch | 58 ++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 package/iproute2/0002-ss-add-local-PF_VSOCK-AF_VSOCK-definitions.patch
Applied to next, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com