Merge pull request #2717 from AiyionPrime/master-updates

Master updates

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=eb639e54fcbe03d9fda99e2d3e60b2d53658bab5
+OPENWRT_COMMIT=6cd1035d8dc001561331ca9e613d7dfc7d0fd7a6
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-22.03
-PACKAGES_PACKAGES_COMMIT=f6a68877618453a1e8430c6b4dce78f99f8f7dd8
+PACKAGES_PACKAGES_COMMIT=04eadf8600fa21dbdd1bc4de846fefe11d06797b
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
 PACKAGES_ROUTING_BRANCH=openwrt-22.03

patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch

@@ -3,7 +3,7 @@ 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 4057c4ea11b29233be7673a77fc2c8100209d8b3..c80d6e7f3aa0d1222aa087ba3cb11b8905a576b3 100644
+index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ade6567eaa 100644
 --- a/target/linux/ramips/image/mt7621.mk
 +++ b/target/linux/ramips/image/mt7621.mk
 @@ -179,7 +179,6 @@ endef
@@ -38,7 +38,7 @@ index 4057c4ea11b29233be7673a77fc2c8100209d8b3..c80d6e7f3aa0d1222aa087ba3cb11b89
    $(Device/netgear_sercomm_nor)
    $(Device/uimage-lzma-loader)
    IMAGE_SIZE := 15232k
-@@ -1753,7 +1749,6 @@ endef
+@@ -1754,7 +1750,6 @@ endef
  TARGET_DEVICES += tplink_tl-wpa8631p-v3
  
  define Device/ubnt_edgerouter_common
@@ -46,7 +46,7 @@ index 4057c4ea11b29233be7673a77fc2c8100209d8b3..c80d6e7f3aa0d1222aa087ba3cb11b89
    $(Device/uimage-lzma-loader)
    DEVICE_VENDOR := Ubiquiti
    IMAGE_SIZE := 256768k
-@@ -2152,7 +2147,6 @@ endef
+@@ -2170,7 +2165,6 @@ endef
  TARGET_DEVICES += zbtlink_zbt-wg2626
  
  define Device/zbtlink_zbt-wg3526-16m
@@ -54,7 +54,7 @@ index 4057c4ea11b29233be7673a77fc2c8100209d8b3..c80d6e7f3aa0d1222aa087ba3cb11b89
    $(Device/uimage-lzma-loader)
    IMAGE_SIZE := 16064k
    DEVICE_VENDOR := Zbtlink
-@@ -2165,7 +2159,6 @@ endef
+@@ -2183,7 +2177,6 @@ endef
  TARGET_DEVICES += zbtlink_zbt-wg3526-16m
  
  define Device/zbtlink_zbt-wg3526-32m