* [ptxdist] [PATCH] busybox: New patch to fix compilation with Linux v6.8-rc1
@ 2024-03-23 17:23 Uwe Kleine-König
2024-03-26 16:03 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Uwe Kleine-König @ 2024-03-23 17:23 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
...-Fix-compilation-with-Linux-v6.8-rc1.patch | 61 +++++++++++++++++++
patches/busybox-1.36.1/series | 3 +-
2 files changed, 63 insertions(+), 1 deletion(-)
create mode 100644 patches/busybox-1.36.1/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
diff --git a/patches/busybox-1.36.1/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch b/patches/busybox-1.36.1/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
new file mode 100644
index 000000000000..23715aa1a588
--- /dev/null
+++ b/patches/busybox-1.36.1/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
@@ -0,0 +1,61 @@
+From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
+Date: Sat, 23 Mar 2024 13:28:56 +0100
+Subject: [PATCH] tc: Fix compilation with Linux v6.8-rc1
+
+Linux v6.8-rc1 removed the definitions related to CBQ making tc fail to
+build. Add some #ifdefs to handle this missing support.
+
+Forwarded: http://lists.busybox.net/pipermail/busybox/2024-March/090678.html
+---
+ networking/tc.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/networking/tc.c b/networking/tc.c
+index 43187f7ee26c..1315b953e39f 100644
+--- a/networking/tc.c
++++ b/networking/tc.c
+@@ -231,6 +231,13 @@ static int cbq_parse_opt(int argc, char **argv, struct nlmsghdr *n)
+ return 0;
+ }
+ #endif
++
++#ifndef TCA_CBQ_MAX
++/*
++ * Linux v6.8-rc1~131^2~60^2^2 removed the uapi definitions for CBQ.
++ * See https://git.kernel.org/linus/33241dca48626
++ */
++#else
+ static int cbq_print_opt(struct rtattr *opt)
+ {
+ struct rtattr *tb[TCA_CBQ_MAX+1];
+@@ -322,6 +329,7 @@ static int cbq_print_opt(struct rtattr *opt)
+ done:
+ return 0;
+ }
++#endif
+
+ static FAST_FUNC int print_qdisc(
+ const struct sockaddr_nl *who UNUSED_PARAM,
+@@ -372,8 +380,10 @@ static FAST_FUNC int print_qdisc(
+ int qqq = index_in_strings(_q_, name);
+ if (qqq == 0) { /* pfifo_fast aka prio */
+ prio_print_opt(tb[TCA_OPTIONS]);
++#ifdef TCA_CBQ_MAX
+ } else if (qqq == 1) { /* class based queuing */
+ cbq_print_opt(tb[TCA_OPTIONS]);
++#endif
+ } else {
+ /* don't know how to print options for this qdisc */
+ printf("(options for %s)", name);
+@@ -442,9 +452,11 @@ static FAST_FUNC int print_class(
+ int qqq = index_in_strings(_q_, name);
+ if (qqq == 0) { /* pfifo_fast aka prio */
+ /* nothing. */ /*prio_print_opt(tb[TCA_OPTIONS]);*/
++#ifdef TCA_CBQ_MAX
+ } else if (qqq == 1) { /* class based queuing */
+ /* cbq_print_copt() is identical to cbq_print_opt(). */
+ cbq_print_opt(tb[TCA_OPTIONS]);
++#endif
+ } else {
+ /* don't know how to print options for this class */
+ printf("(options for %s)", name);
diff --git a/patches/busybox-1.36.1/series b/patches/busybox-1.36.1/series
index ee536088790b..87fee50916c0 100644
--- a/patches/busybox-1.36.1/series
+++ b/patches/busybox-1.36.1/series
@@ -6,4 +6,5 @@
0200-reactivate-check-for-tty.patch
0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
-# 9c0cc4baa8090165b429198c9a10e02c - git-ptx-patches magic
+0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
+# e781b8c6838e27fd021f9c1a9f87654d - git-ptx-patches magic
base-commit: 30ecf336507b8eb1111c4742161ac00b4eb7edcc
--
2.39.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] busybox: New patch to fix compilation with Linux v6.8-rc1
2024-03-23 17:23 [ptxdist] [PATCH] busybox: New patch to fix compilation with Linux v6.8-rc1 Uwe Kleine-König
@ 2024-03-26 16:03 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2024-03-26 16:03 UTC (permalink / raw)
To: ptxdist; +Cc: Uwe Kleine-König
Thanks, applied as 54229b64d737d46cbb5e5913700937ba2d1c40af.
Michael
[sent from post-receive hook]
On Tue, 26 Mar 2024 17:03:32 +0100, Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Message-Id: <20240323172337.741656-1-u.kleine-koenig@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/busybox-1.36.1/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch b/patches/busybox-1.36.1/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
> new file mode 100644
> index 000000000000..23715aa1a588
> --- /dev/null
> +++ b/patches/busybox-1.36.1/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
> @@ -0,0 +1,61 @@
> +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de>
> +Date: Sat, 23 Mar 2024 13:28:56 +0100
> +Subject: [PATCH] tc: Fix compilation with Linux v6.8-rc1
> +
> +Linux v6.8-rc1 removed the definitions related to CBQ making tc fail to
> +build. Add some #ifdefs to handle this missing support.
> +
> +Forwarded: http://lists.busybox.net/pipermail/busybox/2024-March/090678.html
> +---
> + networking/tc.c | 12 ++++++++++++
> + 1 file changed, 12 insertions(+)
> +
> +diff --git a/networking/tc.c b/networking/tc.c
> +index 43187f7ee26c..1315b953e39f 100644
> +--- a/networking/tc.c
> ++++ b/networking/tc.c
> +@@ -231,6 +231,13 @@ static int cbq_parse_opt(int argc, char **argv, struct nlmsghdr *n)
> + return 0;
> + }
> + #endif
> ++
> ++#ifndef TCA_CBQ_MAX
> ++/*
> ++ * Linux v6.8-rc1~131^2~60^2^2 removed the uapi definitions for CBQ.
> ++ * See https://git.kernel.org/linus/33241dca48626
> ++ */
> ++#else
> + static int cbq_print_opt(struct rtattr *opt)
> + {
> + struct rtattr *tb[TCA_CBQ_MAX+1];
> +@@ -322,6 +329,7 @@ static int cbq_print_opt(struct rtattr *opt)
> + done:
> + return 0;
> + }
> ++#endif
> +
> + static FAST_FUNC int print_qdisc(
> + const struct sockaddr_nl *who UNUSED_PARAM,
> +@@ -372,8 +380,10 @@ static FAST_FUNC int print_qdisc(
> + int qqq = index_in_strings(_q_, name);
> + if (qqq == 0) { /* pfifo_fast aka prio */
> + prio_print_opt(tb[TCA_OPTIONS]);
> ++#ifdef TCA_CBQ_MAX
> + } else if (qqq == 1) { /* class based queuing */
> + cbq_print_opt(tb[TCA_OPTIONS]);
> ++#endif
> + } else {
> + /* don't know how to print options for this qdisc */
> + printf("(options for %s)", name);
> +@@ -442,9 +452,11 @@ static FAST_FUNC int print_class(
> + int qqq = index_in_strings(_q_, name);
> + if (qqq == 0) { /* pfifo_fast aka prio */
> + /* nothing. */ /*prio_print_opt(tb[TCA_OPTIONS]);*/
> ++#ifdef TCA_CBQ_MAX
> + } else if (qqq == 1) { /* class based queuing */
> + /* cbq_print_copt() is identical to cbq_print_opt(). */
> + cbq_print_opt(tb[TCA_OPTIONS]);
> ++#endif
> + } else {
> + /* don't know how to print options for this class */
> + printf("(options for %s)", name);
> diff --git a/patches/busybox-1.36.1/series b/patches/busybox-1.36.1/series
> index ee536088790b..87fee50916c0 100644
> --- a/patches/busybox-1.36.1/series
> +++ b/patches/busybox-1.36.1/series
> @@ -6,4 +6,5 @@
> 0200-reactivate-check-for-tty.patch
> 0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
> 0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
> -# 9c0cc4baa8090165b429198c9a10e02c - git-ptx-patches magic
> +0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
> +# e781b8c6838e27fd021f9c1a9f87654d - git-ptx-patches magic
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-03-26 16:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-03-23 17:23 [ptxdist] [PATCH] busybox: New patch to fix compilation with Linux v6.8-rc1 Uwe Kleine-König
2024-03-26 16:03 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox