liminix

commit b0111e03a603057d9154051b2b28bdeadd78fab5
parent 8d6db1ae34b0635edf201911a716abed0e7aa7e3
Author: Daniel Barlow <dan@telent.net>
Date:   Thu, 12 Nov 2026 21:42:44 +0000

openwrt 25.12 fix the rt2x00 module build

* choose better oldSrc for applying patches from
* update special case munging for patches that don't apply cleanly

Diffstat:
M
pkgs/openwrt/2512.nix
 | 
15
+++++++++------

1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/pkgs/openwrt/2512.nix b/pkgs/openwrt/2512.nix
@@ -19,8 +19,8 @@ let
     name = "openwrt-source";
     repo = "openwrt";
     owner = "openwrt";
-    rev = "c8eacec725dce34c7b621f00c9bce814fe413759";
-    hash = "sha256-YTfAWmFPXPXFQ56QGRLgCc/QY+RndOdVdcgtBaZsh1E=";
+    rev = "a85059438f2caed0d01a87fce9b8bd5bed134bb2";
+    hash = "sha256-WE6MFvtr2mTnnVL9EqlGmWXEoYb6J24C74kK4bNw5qM=";
   };
   kernelVersion = "6.12.113";
   kernelSeries = lib.versions.majorMinor kernelVersion;
@@ -57,6 +57,7 @@ let
 \tdepends on m'  $kconfig
     done
 
+    echo doPatch ${family} done
   '';
 in
 {
@@ -79,17 +80,19 @@ in
 
   applyPatches.rt2x00 = ''
     PATH=${pkgsBuildBuild.patchutils}/bin:$PATH
-    for i in ${src}/package/kernel/mac80211/patches/rt2x00/6*.patch ; do
+    for i in ${oldSrc}/package/kernel/mac80211/patches/rt2x00/6*.patch ; do
       fixed=$(basename $i).fixed
       sed '/depends on m/d'  < $i | sed 's/CPTCFG_/CONFIG_/g' | recountdiff | filterdiff -x '*/local-symbols' > $fixed
+      echo Applying $fixed
+
       case $fixed in
-        606-*)
+        606-*|607-*)
           ;;
         611-*)
           filterdiff -x '*/rt2x00.h' < $fixed | patch --forward -p1
           ;;
-        601-*|607-*)
-          filterdiff -x '*/rt2x00_platform.h' < $fixed | patch --forward -p1
+        609-*)
+          sed < $fixed -e 's/ralink,rt7620-wmac/ralink,rt7620-wifi/g' -e 's/ralink,rt2880-wmac/ralink,rt2880-wifi/g' | patch --forward -p1
           ;;
         *)
           cat $fixed | patch --forward -p1