Merge pull request #2880 from herbetom/master-updates

modules: update to latest HEAD

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=074db5793641b197892f210d60223f17340d9e6f
+OPENWRT_COMMIT=3960c220daabe5b58381af1a8c7b9dd2e6b7e815
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-22.03
-PACKAGES_PACKAGES_COMMIT=7158688679d3411f635ce0a7f83984b7d65cfb28
+PACKAGES_PACKAGES_COMMIT=d057936acbefd76b033e7c365baa68b48ccb9166
 
 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 c3e2291a9d91bae234707b1d81277b645bdd6920..64e02a53d30b71144ef4158a06c3a791f8d91f90 100644
+index 9c451c26bf180a0ea45a33f567def4770b07398e..08f80b9b635adf525003498a34601e81da520978 100644
 --- a/target/linux/ramips/image/mt7621.mk
 +++ b/target/linux/ramips/image/mt7621.mk
 @@ -180,7 +180,6 @@ endef
@@ -14,47 +14,47 @@ index c3e2291a9d91bae234707b1d81277b645bdd6920..64e02a53d30b71144ef4158a06c3a791
    DEVICE_VENDOR := ASUS
    DEVICE_MODEL := RT-AC57U
    DEVICE_ALT0_VENDOR := ASUS
-@@ -1271,7 +1270,6 @@ endef
+@@ -1272,7 +1271,6 @@ endef
  TARGET_DEVICES += mts_wg430223
 
  define Device/netgear_ex6150
 -  $(Device/dsa-migration)
    $(Device/uimage-lzma-loader)
    DEVICE_VENDOR := NETGEAR
    DEVICE_MODEL := EX6150
-@@ -1284,7 +1282,6 @@ endef
+@@ -1285,7 +1283,6 @@ endef
  TARGET_DEVICES += netgear_ex6150
 
  define Device/netgear_sercomm_nand
 -  $(Device/dsa-migration)
    $(Device/uimage-lzma-loader)
    BLOCKSIZE := 128k
    PAGESIZE := 2048
-@@ -1467,7 +1464,6 @@ endef
+@@ -1468,7 +1465,6 @@ endef
  TARGET_DEVICES += netgear_wax202
 
  define Device/netgear_wndr3700-v5
 -  $(Device/dsa-migration)
    $(Device/netgear_sercomm_nor)
    $(Device/uimage-lzma-loader)
    IMAGE_SIZE := 15232k
-@@ -1804,7 +1800,6 @@ endef
+@@ -1805,7 +1801,6 @@ endef
  TARGET_DEVICES += tplink_tl-wpa8631p-v3
 
  define Device/ubnt_edgerouter_common
 -  $(Device/dsa-migration)
    $(Device/uimage-lzma-loader)
    DEVICE_VENDOR := Ubiquiti
    IMAGE_SIZE := 256768k
-@@ -2220,7 +2215,6 @@ endef
+@@ -2221,7 +2216,6 @@ endef
  TARGET_DEVICES += zbtlink_zbt-wg2626
 
  define Device/zbtlink_zbt-wg3526-16m
 -  $(Device/dsa-migration)
    $(Device/uimage-lzma-loader)
    IMAGE_SIZE := 16064k
    DEVICE_VENDOR := Zbtlink
-@@ -2233,7 +2227,6 @@ endef
+@@ -2234,7 +2228,6 @@ endef
  TARGET_DEVICES += zbtlink_zbt-wg3526-16m
 
  define Device/zbtlink_zbt-wg3526-32m

patches/openwrt/0011-ath79-combine-OCEDO-dual-firmware-partitions.patch

@@ -83,10 +83,10 @@ index 2dc4c07e918c50eb522100eb7f72c8804d5ba5fb..f8b3681bb7f143a498d5cb64897af335
 
  			partition@ed0000 {
 diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
-index 31d296fb62a1bb3fee4dfaba894f8339c48dd59c..deb5644ef525cf85ab7671d053d4ae6f2ee8e951 100644
+index f1542e4e38f7540dd9facf4c40f0b271b9ea1e45..87d01a42eda274f9197f3382d955b87ecf615f7d 100644
 --- a/target/linux/ath79/image/generic.mk
 +++ b/target/linux/ath79/image/generic.mk
-@@ -1797,7 +1797,7 @@ define Device/ocedo_koala
+@@ -1803,7 +1803,7 @@ define Device/ocedo_koala
    DEVICE_MODEL := Koala
    DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
    SUPPORTED_DEVICES += koala
@@ -95,7 +95,7 @@ index 31d296fb62a1bb3fee4dfaba894f8339c48dd59c..deb5644ef525cf85ab7671d053d4ae6f
  endef
  TARGET_DEVICES += ocedo_koala
 
-@@ -1805,7 +1805,7 @@ define Device/ocedo_raccoon
+@@ -1811,7 +1811,7 @@ define Device/ocedo_raccoon
    SOC := ar9344
    DEVICE_VENDOR := Ocedo
    DEVICE_MODEL := Raccoon
@@ -104,7 +104,7 @@ index 31d296fb62a1bb3fee4dfaba894f8339c48dd59c..deb5644ef525cf85ab7671d053d4ae6f
  endef
  TARGET_DEVICES += ocedo_raccoon
 
-@@ -1814,7 +1814,7 @@ define Device/ocedo_ursus
+@@ -1820,7 +1820,7 @@ define Device/ocedo_ursus
    DEVICE_VENDOR := Ocedo
    DEVICE_MODEL := Ursus
    DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct