diff --git a/modules b/modules index a870faa2..3215a7b6 100644 --- a/modules +++ b/modules @@ -2,11 +2,11 @@ GLUON_FEEDS='packages routing gluon' OPENWRT_REPO=https://github.com/openwrt/openwrt.git OPENWRT_BRANCH=openwrt-22.03 -OPENWRT_COMMIT=f5db04e8ea8377046a86885fdd5a83e948b54918 +OPENWRT_COMMIT=c2331038b2577cfeb6d34b3b6a812c6c1cf7ba5f PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git PACKAGES_PACKAGES_BRANCH=openwrt-22.03 -PACKAGES_PACKAGES_COMMIT=0d566071c90f7c1088fdc09360dc4216bef6765e +PACKAGES_PACKAGES_COMMIT=391e18067e486017ba2feea69a4e430721c8b963 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git PACKAGES_ROUTING_BRANCH=openwrt-22.03 diff --git a/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch b/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch index d8fcb579..0c15ef43 100644 --- a/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch +++ b/patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch @@ -3,10 +3,10 @@ Date: Sun, 5 Jun 2022 23:43:38 +0200 Subject: ramips-mt7621: make DSA images swconfig upgradable diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk -index df2b935c886df50badb2cfed64d803e36f995894..70286a5ce17581672467408dc001f4f33966503c 100644 +index 1fb806043460895182159504f48708ae717379cb..e14c61b69a4c7f236ff363569cc9943245f7f901 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk -@@ -179,7 +179,6 @@ endef +@@ -180,7 +180,6 @@ endef TARGET_DEVICES += asiarf_ap7621-nv1 define Device/asus_rt-ac57u @@ -14,7 +14,7 @@ index df2b935c886df50badb2cfed64d803e36f995894..70286a5ce17581672467408dc001f4f3 DEVICE_VENDOR := ASUS DEVICE_MODEL := RT-AC57U DEVICE_ALT0_VENDOR := ASUS -@@ -1246,7 +1245,6 @@ endef +@@ -1247,7 +1246,6 @@ endef TARGET_DEVICES += mts_wg430223 define Device/netgear_ex6150 @@ -22,7 +22,7 @@ index df2b935c886df50badb2cfed64d803e36f995894..70286a5ce17581672467408dc001f4f3 $(Device/uimage-lzma-loader) DEVICE_VENDOR := NETGEAR DEVICE_MODEL := EX6150 -@@ -1259,7 +1257,6 @@ endef +@@ -1260,7 +1258,6 @@ endef TARGET_DEVICES += netgear_ex6150 define Device/netgear_sercomm_nand @@ -30,7 +30,7 @@ index df2b935c886df50badb2cfed64d803e36f995894..70286a5ce17581672467408dc001f4f3 $(Device/uimage-lzma-loader) BLOCKSIZE := 128k PAGESIZE := 2048 -@@ -1442,7 +1439,6 @@ endef +@@ -1443,7 +1440,6 @@ endef TARGET_DEVICES += netgear_wax202 define Device/netgear_wndr3700-v5 @@ -38,7 +38,7 @@ index df2b935c886df50badb2cfed64d803e36f995894..70286a5ce17581672467408dc001f4f3 $(Device/netgear_sercomm_nor) $(Device/uimage-lzma-loader) IMAGE_SIZE := 15232k -@@ -1779,7 +1775,6 @@ endef +@@ -1780,7 +1776,6 @@ endef TARGET_DEVICES += tplink_tl-wpa8631p-v3 define Device/ubnt_edgerouter_common @@ -46,7 +46,7 @@ index df2b935c886df50badb2cfed64d803e36f995894..70286a5ce17581672467408dc001f4f3 $(Device/uimage-lzma-loader) DEVICE_VENDOR := Ubiquiti IMAGE_SIZE := 256768k -@@ -2195,7 +2190,6 @@ endef +@@ -2196,7 +2191,6 @@ endef TARGET_DEVICES += zbtlink_zbt-wg2626 define Device/zbtlink_zbt-wg3526-16m @@ -54,7 +54,7 @@ index df2b935c886df50badb2cfed64d803e36f995894..70286a5ce17581672467408dc001f4f3 $(Device/uimage-lzma-loader) IMAGE_SIZE := 16064k DEVICE_VENDOR := Zbtlink -@@ -2208,7 +2202,6 @@ endef +@@ -2209,7 +2203,6 @@ endef TARGET_DEVICES += zbtlink_zbt-wg3526-16m define Device/zbtlink_zbt-wg3526-32m diff --git a/patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch b/patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch index 987050ac..ec9641c0 100644 --- a/patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch +++ b/patches/openwrt/0007-kernel-bridge-Implement-MLD-Querier-wake-up-calls-Android-bug-workaround.patch @@ -208,7 +208,7 @@ index 0000000000000000000000000000000000000000..e3da684dc950ea4c226705d27b23b047 + + int system_bridge_addif(struct device *bridge, struct device *dev) diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 -index 4a17e635b2b4ff62e362c1815723aeaf30b1b443..9b11be8fcd59836a0c6351babae78343658a80f2 100644 +index a348d4821ecef796c8c2b983a969b7becb7ae334..dad7baabe69f53ca9afeff8e9392397dd9dc35aa 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 @@ -738,6 +738,7 @@ CONFIG_BRIDGE=y