linux-6.3-rc4

sbwml · Mar 31, 2023 · d905b4d · d905b4d
1 parent 7492a7b
commit d905b4d
Show file tree

Hide file tree

Showing 35 changed files with 59 additions and 450 deletions.
diff --git a/README.md b/README.md
@@ -13,23 +13,17 @@ bash <(curl -sS https://init2.cooluc.com/build.sh) stable
 # linux-6.1
 bash <(curl -sS https://init2.cooluc.com/build.sh) rc
 
-# linux-6.2 - testing
-KERNEL_TESTING=1 bash <(curl -sS https://init2.cooluc.com/build.sh) rc
-
 # linux-6.3 - testing
-KERNEL_TESTING=1 KERNEL_VER=6.3 bash <(curl -sS https://init2.cooluc.com/build.sh) rc
+KERNEL_TESTING=1 bash <(curl -sS https://init2.cooluc.com/build.sh) rc
 ```
 
 ## nanopi-r5s/r5c openwrt-22.03
 ```shell
 # linux-6.1
 bash <(curl -sS https://init2.cooluc.com/build.sh) rc r5s
 
-# linux-6.2 - testing
-KERNEL_TESTING=1 bash <(curl -sS https://init2.cooluc.com/build.sh) rc r5s
-
 # linux-6.3 - testing
-KERNEL_TESTING=1 KERNEL_VER=6.3 bash <(curl -sS https://init2.cooluc.com/build.sh) rc r5s
+KERNEL_TESTING=1 bash <(curl -sS https://init2.cooluc.com/build.sh) rc r5s
 ```
 
 ## x86_64 openwrt-21.02
@@ -79,23 +73,17 @@ bash <(curl -sS https://init2.cooluc.com/build.sh) rc x86
 # linux-6.1
 bash <(curl -sS https://raw.githubusercontent.com/你的用户名/r4s_build_script/master/openwrt/build.sh) rc
 
-# linux-6.2 - testing
-KERNEL_TESTING=1 bash <(curl -sS https://raw.githubusercontent.com/你的用户名/r4s_build_script/master/openwrt/build.sh) rc
-
 # linux-6.3 - testing
-KERNEL_TESTING=1 KERNEL_VER=6.3 bash <(curl -sS https://raw.githubusercontent.com/你的用户名/r4s_build_script/master/openwrt/build.sh) rc
+KERNEL_TESTING=1 bash <(curl -sS https://raw.githubusercontent.com/你的用户名/r4s_build_script/master/openwrt/build.sh) rc
 ```
 
 #### nanopi-r5s/r5c openwrt-22.03
 ```shell
 # linux-6.1
 bash <(curl -sS https://raw.githubusercontent.com/你的用户名/r4s_build_script/master/openwrt/build.sh) rc r5s
 
-# linux-6.2 - testing
-KERNEL_TESTING=1 bash <(curl -sS https://raw.githubusercontent.com/你的用户名/r4s_build_script/master/openwrt/build.sh) rc r5s
-
 # linux-6.3 - testing
-KERNEL_TESTING=1 KERNEL_VER=6.3 bash <(curl -sS https://raw.githubusercontent.com/你的用户名/r4s_build_script/master/openwrt/build.sh) rc r5s
+KERNEL_TESTING=1 bash <(curl -sS https://raw.githubusercontent.com/你的用户名/r4s_build_script/master/openwrt/build.sh) rc r5s
 ```
 
 -----------------
@@ -221,4 +209,3 @@ jobs:
         artifacts: rom/*
 
 ```
-
diff --git a/build.sh b/build.sh
@@ -0,0 +1 @@
+openwrt/build.sh
diff --git a/openwrt/build.sh b/openwrt/build.sh
@@ -86,7 +86,7 @@ fi
 # nanopi - openwrt 22.03 kernel version
 if [ "$KERNEL_TESTING" = 1 ]; then
     export KERNEL_TESTING=1
-    [ "$KERNEL_VER" = "6.3" ] && export KERNEL_VER=6.3 || export KERNEL_VER=6.2
+    [ "$KERNEL_VER" = "6.3" ] && export KERNEL_VER=6.3 || export KERNEL_VER=6.3
 else
     export KERNEL_TESTING=""
     export KERNEL_VER=6.1
@@ -233,9 +233,8 @@ fi
 # glibc
 [ "$USE_GLIBC" = "y" ] && curl -s https://$mirror/openwrt/config-glibc >> .config
 
-# linux-6.2
+# testing kernel
 [ "$KERNEL_TESTING" = 1 ] && echo CONFIG_TESTING_KERNEL=y >> .config
-[ "$KERNEL_TESTING" = 1 ] && echo '# CONFIG_PACKAGE_kmod-pf-ring is not set' >> .config
 
 # linux-6.3
 # waiting for repair !!!
@@ -246,6 +245,7 @@ if [ "$KERNEL_VER" = "6.3" ]; then
 # CONFIG_PACKAGE_kmod-dahdi-dummy is not set
 # CONFIG_PACKAGE_kmod-dahdi-echocan-oslec is not set
 # CONFIG_PACKAGE_kmod-dahdi-hfcs is not set
+# CONFIG_PACKAGE_kmod-pf-ring is not set
 EOF
 fi
 

diff --git a/...patch/kernel-6.1/bbr2_6.2/0012-net-tcp-re-generalize-TSO-sizing-in-TCP-CC-module-AP.patch b/...patch/kernel-6.1/bbr2_6.2/0012-net-tcp-re-generalize-TSO-sizing-in-TCP-CC-module-AP.patch
diff --git a/...en-app-limited-rate-sample-detectio.patch → ...en-app-limited-rate-sample-detectio.patch b/...en-app-limited-rate-sample-detectio.patch → ...en-app-limited-rate-sample-detectio.patch
diff --git a/...rink-delivered_mstamp-first_tx_msta.patch → ...rink-delivered_mstamp-first_tx_msta.patch b/...rink-delivered_mstamp-first_tx_msta.patch → ...rink-delivered_mstamp-first_tx_msta.patch
diff --git a/...apshot-packets-in-flight-at-transmi.patch → ...apshot-packets-in-flight-at-transmi.patch b/...apshot-packets-in-flight-at-transmi.patch → ...apshot-packets-in-flight-at-transmi.patch
diff --git a/...unt-packets-lost-over-TCP-rate-samp.patch → ...unt-packets-lost-over-TCP-rate-samp.patch b/...unt-packets-lost-over-TCP-rate-samp.patch → ...unt-packets-lost-over-TCP-rate-samp.patch
diff --git a/...port-FLAG_ECE-in-rate_sample.is_ece.patch → ...port-FLAG_ECE-in-rate_sample.is_ece.patch b/...port-FLAG_ECE-in-rate_sample.is_ece.patch → ...port-FLAG_ECE-in-rate_sample.is_ece.patch
diff --git a/...troduce-ca_ops-skb_marked_lost-CC-m.patch → ...troduce-ca_ops-skb_marked_lost-CC-m.patch b/...troduce-ca_ops-skb_marked_lost-CC-m.patch → ...troduce-ca_ops-skb_marked_lost-CC-m.patch
diff --git a/...ctor-out-tx.in_flight-setting-into-.patch → ...ctor-out-tx.in_flight-setting-into-.patch b/...ctor-out-tx.in_flight-setting-into-.patch → ...ctor-out-tx.in_flight-setting-into-.patch
diff --git a/...just-skb-tx.in_flight-upon-merge-in.patch → ...just-skb-tx.in_flight-upon-merge-in.patch b/...just-skb-tx.in_flight-upon-merge-in.patch → ...just-skb-tx.in_flight-upon-merge-in.patch
diff --git a/...just-skb-tx.in_flight-upon-split-in.patch → ...just-skb-tx.in_flight-upon-split-in.patch b/...just-skb-tx.in_flight-upon-split-in.patch → ...just-skb-tx.in_flight-upon-split-in.patch
diff --git a/...t-tx.in_flight-for-skbs-in-repair-w.patch → ...t-tx.in_flight-for-skbs-in-repair-w.patch b/...t-tx.in_flight-for-skbs-in-repair-w.patch → ...t-tx.in_flight-for-skbs-in-repair-w.patch
diff --git a/...a-opts-flag-TCP_CONG_WANTS_CE_EVENT.patch → ...a-opts-flag-TCP_CONG_WANTS_CE_EVENT.patch b/...a-opts-flag-TCP_CONG_WANTS_CE_EVENT.patch → ...a-opts-flag-TCP_CONG_WANTS_CE_EVENT.patch
diff --git a/...ack_mode-1-skip-rwin-check-in-tcp_f.patch → ...ack_mode-1-skip-rwin-check-in-tcp_f.patch b/...ack_mode-1-skip-rwin-check-in-tcp_f.patch → ...ack_mode-1-skip-rwin-check-in-tcp_f.patch
diff --git a/...Rv2-bbr2-congestion-control-for-Lin.patch → ...Rv2-bbr2-congestion-control-for-Lin.patch b/...Rv2-bbr2-congestion-control-for-Lin.patch → ...Rv2-bbr2-congestion-control-for-Lin.patch
diff --git a/...fig-for-kernel-circa-v5.10-with-man.patch → ...fig-for-kernel-circa-v5.10-with-man.patch b/...fig-for-kernel-circa-v5.10-with-man.patch → ...fig-for-kernel-circa-v5.10-with-man.patch
diff --git a/...ce-install.sh-script-to-build-and-i.patch → ...ce-install.sh-script-to-build-and-i.patch b/...ce-install.sh-script-to-build-and-i.patch → ...ce-install.sh-script-to-build-and-i.patch
diff --git a/...for-testing-bbr2-with-upstream-Linu.patch → ...for-testing-bbr2-with-upstream-Linu.patch b/...for-testing-bbr2-with-upstream-Linu.patch → ...for-testing-bbr2-with-upstream-Linu.patch
diff --git a/...d-a-README.md-for-TCP-BBR-v2-alpha-.patch → ...d-a-README.md-for-TCP-BBR-v2-alpha-.patch b/...d-a-README.md-for-TCP-BBR-v2-alpha-.patch → ...d-a-README.md-for-TCP-BBR-v2-alpha-.patch
diff --git a/...move-unnecessary-rs.delivered_ce-lo.patch → ...move-unnecessary-rs.delivered_ce-lo.patch b/...move-unnecessary-rs.delivered_ce-lo.patch → ...move-unnecessary-rs.delivered_ce-lo.patch
diff --git a/...onfig.bbr2-to-gbuild-kernel-with-CO.patch → ...onfig.bbr2-to-gbuild-kernel-with-CO.patch b/...onfig.bbr2-to-gbuild-kernel-with-CO.patch → ...onfig.bbr2-to-gbuild-kernel-with-CO.patch
diff --git a/...move-field-bw_rtts-that-is-unused-i.patch → ...move-field-bw_rtts-that-is-unused-i.patch b/...move-field-bw_rtts-that-is-unused-i.patch → ...move-field-bw_rtts-that-is-unused-i.patch
diff --git a/...move-cycle_rand-parameter-that-is-u.patch → ...move-cycle_rand-parameter-that-is-u.patch b/...move-cycle_rand-parameter-that-is-u.patch → ...move-cycle_rand-parameter-that-is-u.patch
diff --git a/...namespace-when-nsperf-disables-crt..patch → ...namespace-when-nsperf-disables-crt..patch b/...namespace-when-nsperf-disables-crt..patch → ...namespace-when-nsperf-disables-crt..patch
diff --git a/...n-t-assume-prior_cwnd-was-set-enter.patch → ...n-t-assume-prior_cwnd-was-set-enter.patch b/...n-t-assume-prior_cwnd-was-set-enter.patch → ...n-t-assume-prior_cwnd-was-set-enter.patch
diff --git a/...x-missing-ECT-markings-on-retransmi.patch → ...x-missing-ECT-markings-on-retransmi.patch b/...x-missing-ECT-markings-on-retransmi.patch → ...x-missing-ECT-markings-on-retransmi.patch