some updates

This commit is contained in:
sulincix committed 2024-11-10 09:05:50 +00:00
1 parent 2b2a796e7e
commit e45a73f85a
8 files changed
+132 -24

No files matched your search

@@ -0,0 +1,53 @@
http://lists.busybox.net/pipermail/busybox/2024-March/090678.html
https://bugs.gentoo.org/926872
Linux v6.8-rc1 removed the definitions related to CBQ making tc fail to
build. Add some #ifdefs to handle this missing support.
--- 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 <A HREF="https://git.kernel.org/linus/33241dca48626">https://git.kernel.org/linus/33241dca48626</A>
+ */
+#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(&quot;(options for %s)&quot;, 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(&quot;(options for %s)&quot;, name);
+6 -3
View File
@@ -1,7 +1,7 @@
#!/bin/bash
name=busybox
version=1.36.1
release=2
version=1.37.0
release=3
url='https://busybox.net'
description='BusyBox is a software suite that provides several Unix utilities in a single executable file.'
email='parduscix@yandex.ru'
@@ -16,8 +16,10 @@ source=("https://busybox.net/downloads/busybox-$version.tar.bz2"
"files/udhcpc.openrc"
"files/udhcpc.script"
"data-user.patch"
"busybox-1.36.1-kernel-6.8.patch"
)
md5sums=("0fc591bc9f4e365dfd9ade0014f32561"
sha256sums=("3311dff32e746499f4df0d5df04d7eb396382d7e108bb9250e7b519b837043a4"
"SKIP"
"SKIP"
"SKIP"
"SKIP"
@@ -33,6 +35,7 @@ prepare(){
ln -s /usr/bin/$tool ../musl-$tool
done
patch -Np1 -i ../data-user.patch
patch -Np1 -i ../busybox-1.36.1-kernel-6.8.patch
}
setup(){