diff --git a/busybox-1.36.1-kernel-6.8.patch b/busybox-1.36.1-kernel-6.8.patch
new file mode 100644
index 0000000000000000000000000000000000000000..614148b8cca7e422f7d9457601d0597e478d0eff
--- /dev/null
+++ b/busybox-1.36.1-kernel-6.8.patch
@@ -0,0 +1,52 @@
+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 @@
+ 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 @@
+ done:
+ return 0;
+ }
++#endif
+
+ static FAST_FUNC int print_qdisc(
+ const struct sockaddr_nl *who UNUSED_PARAM,
+@@ -372,8 +380,10 @@
+ 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 @@
+ 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/busybox.spec b/busybox.spec
index dd840ca207e0df93335357a1b74594113f4c7979..a8cff28747dd14d1ed1f90372afb04e697d384cb 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -1,7 +1,7 @@
Name: busybox
Epoch: 1
Version: 1.36.1
-Release: 9
+Release: 10
Summary: The Swiss Army Knife of Embedded Linux
License: GPL-2.0-only
URL: https://www.busybox.net
@@ -11,6 +11,7 @@ Source1: busybox-static.config
Source2: busybox-petitboot.config
Source3: busybox-dynamic.config
+Patch1000: busybox-1.36.1-kernel-6.8.patch
Patch6000: backport-CVE-2022-28391.patch
Patch6001: backport-CVE-2022-48174.patch
Patch6002: backport-CVE-2023-42363.patch
@@ -43,8 +44,7 @@ Petitboot bootloader used on PlayStation 3, the version of the contained
in this package is minimal configured.
%prep
-# auto apply all needed patch with git
-%autosetup -n %{name}-%{version} -p1 -v
+%autosetup -n %{name}-%{version} -p1
%build
export CFLAGS="$RPM_OPT_FLAGS -fPIE" LDFLAGS="-Wl,-z,now"
@@ -89,6 +89,12 @@ install -m 644 docs/busybox.dynamic.1 $RPM_BUILD_ROOT/%{_mandir}/man1/busybox.1
%{_mandir}/man1/busybox.petitboot.1*
%changelog
+* Thu Jul 17 2025 Funda Wang - 1:1.36.1-10
+- Type:BUG
+- Id:NA
+- SUG:NA
+- DESC:fix build with kernel >= 6.8
+
* Mon May 05 2025 Funda Wang - 1:1.36.1-9
- Type:CVE
- Id:NA