From patchwork Mon Sep 23 05:46:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3518 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 487A03F1CD for ; Mon, 23 Sep 2024 07:46:39 +0200 (CEST) Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-5c25f015a67sf3089497a12.0 for ; Sun, 22 Sep 2024 22:46:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1727070399; cv=pass; d=google.com; s=arc-20240605; b=XFDPSeXvrjTd8reH9UaQRh1obSHhkBtJhsu+jg46cHmUAz/daMtWfsW8r/x73K3c7d hIO7wQKDk+K01w57AFLQlPrmKPuULtmDzFtezYLKtLgvwsaPKkLfYdbD7QWHHtdWR9ZQ 2g1A9YiQGrH0gc/GJ+wbCA6VeW035o+gJvJxWlJ8u05aO41ZQY6l8noikQt2xhMPLZPf LAhry3oxw6JVKeEQYl5RsiDC2HAf23cODTNx7NX1RBYiYJ9egy5OmvulXOISwdobZ9uw y3ed2R8KcwY5lPFvR5XQh36VmheOzzsBE3wgshf1853v7gnUj2r+fZWAkN5REvGtiOnA mKBA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=tZB/eaVV4bnH8lQmRt0VCgEE8IFzEUm0lS2LMY3F/pg=; fh=27+OqfWlIgktsENEO3MmicrmXh5/GognplmK/r2WXc4=; b=hFwO7Z0lY6wwprenkGwFDVbJmIj1Fq0dIBPkdG9UciaaSd4e9YGiZf9gSolxRtDc80 0n0XAvUKiX2JjHAUs8NhrhtPn8TjwCbBaxZVGmBLz7mYwjXcfJYELTYiu86ZHikGlNPv gWm4bBEHFF4cxAHy0ukrkLf6ma2hAOUgT3ygFv0tLK0rswtelEbSgZxZhUcqp8vC6Qk4 kZrc3lu05gOe2IE8na+EZgxQB4Zs/elCz3QhdXct7B7Ffubns11ybT1FqXBalHZqg+IQ MC4Ha1eqALHE72xcQN1PuVfvbeiVY1LmK6OqHIVjpJMzI1tN6/vDCYohrMKFY5SqJY2w wmYA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=DB1WEXwM; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1727070399; x=1727675199; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=tZB/eaVV4bnH8lQmRt0VCgEE8IFzEUm0lS2LMY3F/pg=; b=IQ0tLGXn2lkcCMO1EYhoj+/ZmDQ7oBXQmEsQ5F7nWHbxuvwuRNXEmDehp5Owob76di ZqUSgeAj73giO0qYcb+dp3J6HnpB7xGvMlv0BZIvjgiYtDyIB6YJ45cPk2xElfMdRr+j 4O6sGnVdvOyYfhTxX4qNkvd9Zo1Nix2xbbrlo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727070399; x=1727675199; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tZB/eaVV4bnH8lQmRt0VCgEE8IFzEUm0lS2LMY3F/pg=; b=R7OQGihH6nm2OuAGFjC+tgr4YuM0sdzJfQwX/tgqBnJe26RjGM7LkPQ/tFdk0FZEqD GFr82KGJrOeGaYi2nCwlIeQNXzOc/1BfdhF7Eh+9ACng87V4CI3/s+aL9iWYeQOfQBgW bbFSNELcwUgyAgJ+n5ToDOdAdGouqKZs1mCrabxxL+ptwqUzW/SwbcxYbios1kA3+Z2e Mp7yKGtv2fbep0sR7JIXrri1H2CLpwSGjWhkmk/siBA/q7DgdohSs2RJAbsVe0wLrfld brM1W4hMLhPpiYPLCD2T748rGqVld4GUqvZoxeDTz+BHfgFSxHVIs//9i1wQiHFmEnnj vC0A== X-Forwarded-Encrypted: i=2; AJvYcCWSCBXut4gohMYDuGtwWUuhqlG34YdoqKvzsh0qBFy39jG5g/STb/9BPVoItiGb0L9Tz2cuvQd7/gri7o6j@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YzIzEuDYgEMDFQiY/cz7+apdPyRBp2vW2Wss+6DlJrdZV1VdlVp hjSq5i5dtvFPatSajegXEnj5Co0whNhHQiUTlEHF7J2cLTcL9rNtSahiJHJFJHUguaeQau40Nw= = X-Google-Smtp-Source: AGHT+IHrKQzx47yx1CGEskVbE0ilAcBZKjAnCHYguFpQeHhp1EnwZcxCnsTsY0YHCADqQzL/d5kqfQ== X-Received: by 2002:a05:6402:3786:b0:5c0:bb1c:723 with SMTP id 4fb4d7f45d1cf-5c464a3ebf9mr9504986a12.14.1727070398579; Sun, 22 Sep 2024 22:46:38 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:13ca:b0:5c4:2d99:a1e with SMTP id 4fb4d7f45d1cf-5c4595fcc6cls1428055a12.0.-pod-prod-04-eu; Sun, 22 Sep 2024 22:46:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVCbXiqJmkyVqmBiwSUfSCHH0rdGzXB6ZvKD7MtHF9N1/Q/klHNWcwelwwfIpnVAYMpyjzw8xemu3vqdJqD@amarulasolutions.com X-Received: by 2002:a17:907:97ce:b0:a86:9041:a42a with SMTP id a640c23a62f3a-a90d51864d5mr1252509566b.62.1727070396895; Sun, 22 Sep 2024 22:46:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727070396; cv=none; d=google.com; s=arc-20160816; b=hV7FXU6q5zbEWIiTgPKpJwfTKBcAR9p/zrUbE0khciAjRjF2CIw3yCsDbwEy5BW7Um PQsqMiiUkKo1nti9mznoFpwJplnBaaq+vDmsez4pM675PljQwvZh/by2fLPG/goH+bmZ nfZgAxYzd+pdaNzRZQf9PFL7i4kVaxUds83BnDadadd7Bc5AZ417JG+4SeTtHftpAZfl PRWe7+uzbEf+C1PuE5lpW/lLHPzULDAruruijzBaI794+AqTYAmqUoLVLalPNzr7075G Jn6kLDt1M4+XBOScPvJ0+qE3re3WaiQE1Kpv688lQnOGiBqVwMwyQHVHti2gmcLHFa5Y HvTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=w5A+Otrh1VG+ja80Hibcjlp5G0mrYFjXboFUb0Ozeuw=; fh=Mz7SZ0IkSZLMY1leuVo9gPurHm/kOYeLPLB6Vu+hYM8=; b=MKK+WTIa8aZbjSSQLasxJ6VthKQ9G2N8fruF6mxBZhcqvtasMvQUP5T4puKHgR0TKF P0XPs6B1YwZOszoDI6lNVMMSNYokLLIUSbOeCrpiJWRhCA0a3TZpR4bf8JvKj6qajqDK pOSO5uDt3+df5WlqmKKefJ9RHNdNKSFMVhUdRkY5KvusQ8ebsLR6q0SN2eqChjK2mjlI 3E4cq/u4p5+AoQuzTjeEiVEf0YLFe8KFTXYkyao/ryEBSnQNPlvXdpCUfaEzsA++EtZG mD8obrh9xv2/OIRlxRNLXKBXHdurk5E/pJ5PoFby4l86RcFHOUkb49Z88K6JxcdF0jp2 XbkQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=DB1WEXwM; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-a906111466csor768137066b.7.2024.09.22.22.46.36 for (Google Transport Security); Sun, 22 Sep 2024 22:46:36 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCWNzhtzqbXEU2gzUQAt4qztrJXM71I0tEVC2sTClAPR2Y11z7EzFk226Ra8TNtnv2CXBhk+A2AY4+/G6zmI@amarulasolutions.com X-Received: by 2002:a17:907:c7e3:b0:a8d:401b:db85 with SMTP id a640c23a62f3a-a90d504f990mr1007129766b.36.1727070396361; Sun, 22 Sep 2024 22:46:36 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-79-20-102-52.retail.telecomitalia.it. [79.20.102.52]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a90612b39a2sm1157706566b.106.2024.09.22.22.46.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Sep 2024 22:46:36 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Petr Vorel , linux-amarula@amarulasolutions.com, Baruch Siach , Dario Binacchi Subject: [PATCH v3 2/2] package/iproute2: bump to version 6.11.0 Date: Mon, 23 Sep 2024 07:46:26 +0200 Message-ID: <20240923054626.2911036-2-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240923054626.2911036-1-dario.binacchi@amarulasolutions.com> References: <20240923054626.2911036-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=DB1WEXwM; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The building test using musl as the C library for the cross-compilation toolchain raised errors that required the application of two additional patches. Signed-off-by: Dario Binacchi --- Changes v1 -> v2: - Drop changes in .mk. After applying the patches they are not required anymore. - Update commit message. ...04-bridge-mst-fix-a-musl-build-issue.patch | 73 +++++++++++++++++++ ...e-mst-fix-a-further-musl-build-issue.patch | 56 ++++++++++++++ package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 4 files changed, 131 insertions(+), 2 deletions(-) create mode 100644 package/iproute2/0004-bridge-mst-fix-a-musl-build-issue.patch create mode 100644 package/iproute2/0005-bridge-mst-fix-a-further-musl-build-issue.patch diff --git a/package/iproute2/0004-bridge-mst-fix-a-musl-build-issue.patch b/package/iproute2/0004-bridge-mst-fix-a-musl-build-issue.patch new file mode 100644 index 000000000000..9dddfb6e7f26 --- /dev/null +++ b/package/iproute2/0004-bridge-mst-fix-a-musl-build-issue.patch @@ -0,0 +1,73 @@ +From 0359ee6dc57ee8aa21a3f0f7404422c0f9372d3a Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Sun, 22 Sep 2024 14:00:42 +0200 +Subject: [PATCH] bridge: mst: fix a musl build issue + +This patch fixes a compilation error raised by the bump to version 6.11.0 +in Buildroot using musl as the C library for the cross-compilation +toolchain. + +After setting the CFLGAS + +ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) +IPROUTE2_CFLAGS += -D__UAPI_DEF_IN6_ADDR=0 -D__UAPI_DEF_SOCKADDR_IN6=0 \ + -D__UAPI_DEF_IPV6_MREQ=0 +endif + +to fix the following errors: + +In file included from ../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/arpa/inet.h:9, + from ../include/libnetlink.h:14, + from mst.c:10: +../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:23:8: error: redefinition of 'struct in6_addr' + 23 | struct in6_addr { + | ^~~~~~~~ +In file included from ../include/uapi/linux/if_bridge.h:19, + from mst.c:7: +../include/uapi/linux/in6.h:33:8: note: originally defined here + 33 | struct in6_addr { + | ^~~~~~~~ +../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:34:8: error: redefinition of 'struct sockaddr_in6' + 34 | struct sockaddr_in6 { + | ^~~~~~~~~~~~ +../include/uapi/linux/in6.h:50:8: note: originally defined here + 50 | struct sockaddr_in6 { + | ^~~~~~~~~~~~ +../../../host/mips64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:42:8: error: redefinition of 'struct ipv6_mreq' + 42 | struct ipv6_mreq { + | ^~~~~~~~~ +../include/uapi/linux/in6.h:60:8: note: originally defined here + 60 | struct ipv6_mreq { + +I got this further errors + +../include/uapi/linux/in6.h:72:25: error: field 'flr_dst' has incomplete type + 72 | struct in6_addr flr_dst; + | ^~~~~~~ +../include/uapi/linux/if_bridge.h:711:41: error: field 'ip6' has incomplete type + 711 | struct in6_addr ip6; + | ^~~ + +fixed by including the netinet/in.h header. + +Signed-off-by: Dario Binacchi +Upstream: https://patchwork.kernel.org/project/netdevbpf/patch/20240922145011.2104040-1-dario.binacchi@amarulasolutions.com/ +--- + bridge/mst.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/bridge/mst.c b/bridge/mst.c +index 873ca5369fd6..c8f7e6606c3c 100644 +--- a/bridge/mst.c ++++ b/bridge/mst.c +@@ -4,6 +4,7 @@ + */ + + #include ++#include + #include + #include + +-- +2.43.0 + diff --git a/package/iproute2/0005-bridge-mst-fix-a-further-musl-build-issue.patch b/package/iproute2/0005-bridge-mst-fix-a-further-musl-build-issue.patch new file mode 100644 index 000000000000..f4e7c317bf9c --- /dev/null +++ b/package/iproute2/0005-bridge-mst-fix-a-further-musl-build-issue.patch @@ -0,0 +1,56 @@ +From 62c4dfff5ff596984ece7960fba49b05d69f37a7 Mon Sep 17 00:00:00 2001 +From: Dario Binacchi +Date: Sun, 22 Sep 2024 14:11:18 +0200 +Subject: [PATCH] bridge: mst: fix a further musl build issue + +This patch fixes the following build errors: + +In file included from mst.c:11: +../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration + 80 | _PRINT_FUNC(tv, const struct timeval *) + | ^~~~~~~ +../include/json_print.h:50:37: note: in definition of macro '_PRINT_FUNC' + 50 | type value); \ + | ^~~~ +../include/json_print.h:80:30: warning: 'struct timeval' declared inside parameter list will not be visible outside of this definition or declaration + 80 | _PRINT_FUNC(tv, const struct timeval *) + | ^~~~~~~ +../include/json_print.h:55:45: note: in definition of macro '_PRINT_FUNC' + 55 | type value) \ + | ^~~~ +../include/json_print.h: In function 'print_tv': +../include/json_print.h:58:48: error: passing argument 5 of 'print_color_tv' from incompatible pointer type [-Wincompatible-pointer-types] + 58 | value); \ + | ^~~~~ + | | + | const struct timeval * +../include/json_print.h:80:1: note: in expansion of macro '_PRINT_FUNC' + 80 | _PRINT_FUNC(tv, const struct timeval *) + | ^~~~~~~~~~~ +../include/json_print.h:50:42: note: expected 'const struct timeval *' but argument is of type 'const struct timeval *' + 50 | type value); \ + | ^ +../include/json_print.h:80:1: note: in expansion of macro '_PRINT_FUNC' + 80 | _PRINT_FUNC(tv, const struct timeval *) + +Signed-off-by: Dario Binacchi +Upstream: https://patchwork.kernel.org/project/netdevbpf/patch/20240922145011.2104040-2-dario.binacchi@amarulasolutions.com/ +--- + bridge/mst.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/bridge/mst.c b/bridge/mst.c +index c8f7e6606c3c..fccb7fd68140 100644 +--- a/bridge/mst.c ++++ b/bridge/mst.c +@@ -4,6 +4,7 @@ + */ + + #include ++#include + #include + #include + #include +-- +2.43.0 + diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index 0760183b9e66..028a32439644 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 91a62f82737b44905a00fa803369c447d549e914e9a2a4018fdd75b1d54e8dce iproute2-6.10.0.tar.xz +sha256 1f795398a04aeaacd06a8f6ace2cfd913c33fa5953ca99daae83bb5c534611c3 iproute2-6.11.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 08b890b33117..c452b64cdea1 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 6.10.0 +IPROUTE2_VERSION = 6.11.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \