From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 26 Mar 2024 17:03:57 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1rp9HJ-005SEj-22 for lore@lore.pengutronix.de; Tue, 26 Mar 2024 17:03:57 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1rp9HJ-0007eG-DK; Tue, 26 Mar 2024 17:03:57 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rp9Gv-0007Zl-ON; Tue, 26 Mar 2024 17:03:33 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rp9Gv-008du5-C4; Tue, 26 Mar 2024 17:03:33 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rp9Gv-0023EQ-0y; Tue, 26 Mar 2024 17:03:33 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 26 Mar 2024 17:03:33 +0100 Message-Id: <20240326160333.489067-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240323172337.741656-1-u.kleine-koenig@pengutronix.de> References: <20240323172337.741656-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] busybox: New patch to fix compilation with Linux v6.8-rc1 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 54229b64d737d46cbb5e5913700937ba2d1c40af. Michael [sent from post-receive hook] On Tue, 26 Mar 2024 17:03:32 +0100, Uwe Kleine-König wrote: > Signed-off-by: Uwe Kleine-König > Message-Id: <20240323172337.741656-1-u.kleine-koenig@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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?= > +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