Merge pull request #3428 from blocktrron/upstream-main-updates

modules: update to latest Git HEAD
freifunk-gluon · Jan 19, 2025 · 3c04d32 · 3c04d32
2 parents ab1c311 + 8f85366
commit 3c04d32
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 40 deletions.
diff --git a/modules b/modules
@@ -2,15 +2,15 @@ GLUON_FEEDS='gluon packages routing'
 
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
 OPENWRT_BRANCH=openwrt-24.10
-OPENWRT_COMMIT=38d79aca0eb22218b5dcc2ada98cde4bb734bc9c
+OPENWRT_COMMIT=1e079d790ab3eb2d82990c4d547d6ce2635a25f7
 
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_COMMIT=3d08b0fee8dc5d96d8bcdb985fad1d5564de4022
 
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
 PACKAGES_PACKAGES_BRANCH=openwrt-24.10
-PACKAGES_PACKAGES_COMMIT=d6dd15f540bef3b0deffe18a60dbf424a078cf56
+PACKAGES_PACKAGES_COMMIT=4e2a57207972a1747a6fb0803007696bbc841f55
 
 PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
 PACKAGES_ROUTING_BRANCH=openwrt-24.10
-PACKAGES_ROUTING_COMMIT=84d97e684bcb6a63dbfdfbfd9ec7407192861239
+PACKAGES_ROUTING_COMMIT=e87b55c6a642947ad7e24cd5054a637df63d5dbe
diff --git a/patches/openwrt/0009-wifi-scripts-allow-per-IF-mesh-basic-rate-selection.patch b/patches/openwrt/0009-wifi-scripts-allow-per-IF-mesh-basic-rate-selection.patch
diff --git a/targets/armsr.inc b/targets/armsr.inc
@@ -2,8 +2,8 @@
 config('TARGET_ROOTFS_EXT4FS', false)
 
 defaults {
-	factory = '-squashfs-combined',
+	factory = '-squashfs-combined-efi',
 	factory_ext = '.img.gz',
-	sysupgrade = '-squashfs-combined',
+	sysupgrade = '-squashfs-combined-efi',
 	sysupgrade_ext = '.img.gz',
 }