wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-30 09:22:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

busybox: fix build with kernel headers >=6.8

Browse source
This commit is contained in:
classabbyamp 2025-05-15 11:16:09 -04:00
parent 94ec0e189b
commit 8320ca7f3a
No known key found for this signature in database
GPG key ID: 6BE0755918A4C7F5
2 changed files with 52 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
srcpkgs/busybox/patches/no-cbq.patch Normal file
View file

@ -0,0 +1,51 @@
https://bugs.busybox.net/show_bug.cgi?id=15931
diff -up busybox-1.36.1/networking/tc.c.no-cbq busybox-1.36.1/networking/tc.c
--- busybox-1.36.1/networking/tc.c.no-cbq 2024-01-29 10:24:09.135082923 -0500
+++ busybox-1.36.1/networking/tc.c 2024-01-29 10:28:12.009502552 -0500
@@ -31,7 +31,7 @@
//usage: "qdisc [handle QHANDLE] [root|"IF_FEATURE_TC_INGRESS("ingress|")"parent CLASSID]\n"
/* //usage: "[estimator INTERVAL TIME_CONSTANT]\n" */
//usage: " [[QDISC_KIND] [help|OPTIONS]]\n"
-//usage: " QDISC_KIND := [p|b]fifo|tbf|prio|cbq|red|etc.\n"
+//usage: " QDISC_KIND := [p|b]fifo|tbf|prio|red|etc.\n"
//usage: "qdisc show [dev STRING]"IF_FEATURE_TC_INGRESS(" [ingress]")"\n"
//usage: "class [classid CLASSID] [root|parent CLASSID]\n"
//usage: " [[QDISC_KIND] [help|OPTIONS] ]\n"
@@ -230,7 +230,7 @@ static int cbq_parse_opt(int argc, char
{
return 0;
}
-#endif
+
static int cbq_print_opt(struct rtattr *opt)
{
struct rtattr *tb[TCA_CBQ_MAX+1];
@@ -322,6 +322,7 @@ static int cbq_print_opt(struct rtattr *
done:
return 0;
}
+#endif
static FAST_FUNC int print_qdisc(
const struct sockaddr_nl *who UNUSED_PARAM,
@@ -373,7 +374,8 @@ static FAST_FUNC int print_qdisc(
if (qqq == 0) { /* pfifo_fast aka prio */
prio_print_opt(tb[TCA_OPTIONS]);
} else if (qqq == 1) { /* class based queuing */
- cbq_print_opt(tb[TCA_OPTIONS]);
+ /* cbq_print_opt(tb[TCA_OPTIONS]); */
+ printf("cbq not supported");
} else {
/* don't know how to print options for this qdisc */
printf("(options for %s)", name);
@@ -444,7 +446,8 @@ static FAST_FUNC int print_class(
/* nothing. */ /*prio_print_opt(tb[TCA_OPTIONS]);*/
} else if (qqq == 1) { /* class based queuing */
/* cbq_print_copt() is identical to cbq_print_opt(). */
- cbq_print_opt(tb[TCA_OPTIONS]);
+ /* cbq_print_opt(tb[TCA_OPTIONS]); */
+ printf("cbq not supported");
} else {
/* don't know how to print options for this class */
printf("(options for %s)", name);

2
srcpkgs/busybox/template
View file

@ -1,7 +1,7 @@
# Template file for 'busybox'
pkgname=busybox
version=1.34.1
revision=6
revision=7
hostmakedepends="perl"
checkdepends="tar which zip"
short_desc="Swiss Army Knife of Embedded Linux"