update patches

hpx502766238 · Apr 13, 2024 · eb38b36 · eb38b36
1 parent 20c975b
commit eb38b36
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/install → install.sh b/install → install.sh
@@ -20,19 +20,19 @@ else
     exit 1
 fi
 #apply general patches
-for PATCH_FILE in $(ls$PATCH_DIR_GENERAL/*.patch); do
+for PATCH_FILE in $(ls $PATCH_DIR_GENERAL/*.patch); do
     echo "Applying patch: $PATCH_FILE"
-    patch -p0 < $PATCH_FILE
+    patch -p0 -f --verbose < $PATCH_FILE
     if [ $? -ne 0 ]; then
         echo "Failed to apply patch: $PATCH_FILE"
         exit 1
     fi
     echo "Patch applied successfully: $PATCH_FILE"
 done
 #apply luci patches
-for PATCH_FILE in $(ls$PATCH_DIR_LUCI/*.patch); do
+for PATCH_FILE in $(ls $PATCH_DIR_LUCI/*.patch); do
     echo "Applying patch: $PATCH_FILE"
-    patch -p0 < $PATCH_FILE
+    patch -p0 -f --verbose < $PATCH_FILE
     if [ $? -ne 0 ]; then
         echo "Failed to apply patch: $PATCH_FILE"
         exit 1

diff --git a/patches/general/1_add_mtkhnat_modules.patch b/patches/general/1_add_mtkhnat_modules.patch
@@ -1,6 +1,6 @@
 --- target/linux/mediatek/modules.mk
 +++ target/linux/mediatek/modules.mk
-@@ -1,0 +1,14 @@
+@@ -1,0 +1,11 @@
 +define KernelPackage/mtk-hnat
 +  SUBMENU:=Network Devices
 +  TITLE:=MediaTek MT762x HW NAT driver
@@ -11,8 +11,9 @@
 +endef
 +
 +$(eval $(call KernelPackage,mtk-hnat))
---- target/linux/mediatek/mt7622/config-5.10	
-+++ target/linux/mediatek/mt7622/config-5.10	
++
+--- target/linux/mediatek/mt7622/config-5.10
++++ target/linux/mediatek/mt7622/config-5.10
 @@ -286,1 +286,2 @@
 -CONFIG_NET_MEDIATEK_SOC=y
 +# CONFIG_NET_MEDIATEK_SOC is not set

diff --git a/patches/general/2_change_mt7622_device_packages.patch b/patches/general/2_change_mt7622_device_packages.patch
@@ -1,5 +1,5 @@
---- /target/linux/mediatek/image/mt7622.mk
-+++ /target/linux/mediatek/image/mt7622.mk
+--- target/linux/mediatek/image/mt7622.mk
++++ target/linux/mediatek/image/mt7622.mk
 @@ -297,7 +297,7 @@
    DEVICE_DTS := mt7622-xiaomi-redmi-router-ax6s
    DEVICE_DTS_DIR := ../dts