k3s: move go_runc_require.patch to top-level directory

The patch will be needed in all versions later than 1.34
2026-01-06 23:03:15 +01:00
parent d739341bc0
commit 3a3eac6705
2 changed files with 4 additions and 6 deletions
@@ -43,11 +43,6 @@ in
      }
    ) extraArgs).overrideAttrs
      {
-        patches = [
-          # Adds explicit require of opencontainers/runc to go.mod before version.sh is called and
-          # removes it afterwards so that later build commands don't complain about inconsistent
-          # vendoring.
-          ./1_34/go_runc_require.patch
-        ];
+        patches = [ ./go_runc_require.patch ];
      };
 }
@@ -1,3 +1,6 @@
+# Adds explicit require of opencontainers/runc to go.mod before version.sh is called and
+# removes it afterwards so that later build commands don't complain about inconsistent
+# vendoring.
 diff --git a/scripts/package-cli b/scripts/package-cli
 index a15d754926..bc450dbe4e 100755
 --- a/scripts/package-cli