From 51d81107318394664b9208df6d9abeeb8b19b0c5 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 29 Sep 2021 07:58:42 +0200 Subject: [PATCH] remove another conflicting patch for now --- build.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build.sh b/build.sh index 0fd3a67d..17be301f 100755 --- a/build.sh +++ b/build.sh @@ -440,6 +440,9 @@ fi if [ -f target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch ]; then rm -f target/linux/generic/backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch fi +if [ -f target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch ]; then + rm -f target/linux/generic/pending-5.4/640-netfilter-nf_flow_table-add-hardware-offload-support.patch +fi if [ "$OMR_KERNEL" = "5.4" ]; then echo "Set to kernel 5.4 for rpi arch" @@ -485,6 +488,12 @@ if [ "$OMR_KERNEL" = "5.14" ]; then echo "Set to kernel 5.14 for mediatek arch (BPI-R2)" find target/linux/mediatek -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=5.10%KERNEL_PATCHVER:=5.14%g' {} \; echo "Done" + echo "Set to kernel 5.14 for rockchip arch (R2S/R4S)" + find target/linux/rockchip -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=5.4%KERNEL_PATCHVER:=5.14%g' {} \; + echo "Done" + echo "Set to kernel 5.14 for ramips" + find target/linux/ramips -type f -name Makefile -exec sed -i 's%KERNEL_PATCHVER:=5.4%KERNEL_PATCHVER:=5.14%g' {} \; + echo "Done" rm -rf /target/linux/generic/files/drivers/net/phy/b53 fi