diff --git a/build.sh b/build.sh index 25c93508..a020b94e 100755 --- a/build.sh +++ b/build.sh @@ -393,7 +393,7 @@ echo "Done" #echo "Done" # Add BBR2 patch, only working on 64bits images for now -if [ "$OMR_KERNEL" = "5.4" ] && ([ "$OMR_TARGET" = "x86_64" ] || [ "$OMR_TARGET" = "bpi-r64" ] || [ "$OMR_TARGET" = "rpi4" ] || [ "$OMR_TARGET" = "espressobin" ] || [ "$OMR_TARGET" = "r2s" ] || [ "$OMR_TARGET" = "r4s" ] || [ "$OMR_TARGET" = "rpi3" ]); then +if ([ "$OMR_KERNEL" = "5.4" ] || [ "$OMR_KERNEL" = "5.4" ]) && ([ "$OMR_TARGET" = "x86_64" ] || [ "$OMR_TARGET" = "bpi-r64" ] || [ "$OMR_TARGET" = "rpi4" ] || [ "$OMR_TARGET" = "espressobin" ] || [ "$OMR_TARGET" = "r2s" ] || [ "$OMR_TARGET" = "r4s" ] || [ "$OMR_TARGET" = "rpi3" ]); then echo "Checking if BBRv2 patch is set or not" if ! patch -Rf -N -p1 -s --dry-run < ../../../patches/bbr2.patch; then echo "apply..." @@ -401,6 +401,11 @@ if [ "$OMR_KERNEL" = "5.4" ] && ([ "$OMR_TARGET" = "x86_64" ] || [ "$OMR_TARGET" fi echo "Done" fi +if [ "$OMR_KERNEL" = "5.15" ] && ([ "$OMR_TARGET" = "x86_64" ] || [ "$OMR_TARGET" = "bpi-r64" ] || [ "$OMR_TARGET" = "rpi4" ] || [ "$OMR_TARGET" = "espressobin" ] || [ "$OMR_TARGET" = "r2s" ] || [ "$OMR_TARGET" = "r4s" ] || [ "$OMR_TARGET" = "rpi3" ]); then + echo "Checking if BBRv2 patch is set or not" + cp ../../../patches/bbr2-5.15.patch target/linux/generic/hack-5.15/693-tcp_bbr2.patch + echo "Done" +fi echo "Checking if smsc75xx patch is set or not" if ! patch -Rf -N -p1 -s --dry-run < ../../../patches/smsc75xx.patch; then diff --git a/root/target/linux/generic/hack-5.15/693-tcp_bbr2.patch b/patches/bbr2-5.15.patch similarity index 100% rename from root/target/linux/generic/hack-5.15/693-tcp_bbr2.patch rename to patches/bbr2-5.15.patch