[rpms/m1n1] rawhide: Update to 1.6.1; Fixes: RHBZ#2464679

[rpms/m1n1] rawhide: Update to 1.6.1; Fixes: RHBZ#2464679

[Janne Grunau]

            A new commit has been pushed.

            Repo   : rpms/m1n1
            Branch : rawhide
            Commit : 11a3eafd7658f7adc27859b1f89f7e47db4791a5
            Author : Janne Grunau <janne-fdr@jannau.net>
            Date   : 2026-08-08T15:02:57+02:00
            Stats  : +27/-20 in 5 file(s)
            URL    : https://src.fedoraproject.org/rpms/m1n1/c/11a3eafd7658f7adc27859b1f89f7e47db4791a5?branch=rawhide

            Log:
            Update to 1.6.1; Fixes: RHBZ#2464679

additional M3 generation support

---
diff --git a/.gitignore b/.gitignore
index e4ddb50..ef103ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@
 /m1n1-1.6.0-rc1.tar.gz
 /m1n1-1.6.0.tar.gz
 /rust-fatfs-4eccb50d011146fbed20e133d33b22f3c27292e7.tar.gz
+/m1n1-1.6.1.tar.gz

diff --git a/m1n1-1.6.1-rust-deps.patch b/m1n1-1.6.1-rust-deps.patch
new file mode 100644
index 0000000..d3aeb09
--- /dev/null
+++ b/m1n1-1.6.1-rust-deps.patch
@@ -0,0 +1,20 @@
+diff --git i/rust/Cargo.toml w/rust/Cargo.toml
+index 86bce167..088ce63b 100644
+--- i/rust/Cargo.toml
++++ w/rust/Cargo.toml
+@@ -11,9 +11,12 @@ crate-type = [ "staticlib" ]
+ 
+ # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+ [dependencies]
+-fatfs = { git = "https://github.com/rafalh/rust-fatfs", rev = "4eccb50d011146fbed20e133d33b22f3c27292e7", default-features = false, features = ["lfn", "alloc"], optional = true }
+-uuid = {  version = "1.23", default-features = false, optional = true }
++fatfs = { path = "vendor/rust-fatfs", default-features = false, features = ["lfn", "alloc"], optional = true }
++uuid = { version = "1.23", default-features = false, optional = true }
++# bitflags and log are dependencies for fatfs
++bitflags = { version = "2", default-features = false, optional = true }
++log = { version = "0.4", default-features = false, optional = true }
+ versions = { path = "./versions" }
+ 
+ [features]
+-chainload = ["dep:fatfs", "dep:uuid"]
++chainload = ["dep:bitflags", "dep:log", "dep:fatfs", "dep:uuid"]

diff --git a/m1n1-rust-deps.patch b/m1n1-rust-deps.patch
deleted file mode 100644
index 4dc1af9..0000000
--- a/m1n1-rust-deps.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/rust/Cargo.toml b/rust/Cargo.toml
---- a/rust/Cargo.toml
-+++ b/rust/Cargo.toml
-@@ -12,8 +12,11 @@ crate-type = [ "staticlib" ]
- # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
- [dependencies]
- fatfs = { path = "vendor/rust-fatfs", default-features = false, features = ["lfn", "alloc"], optional = true }
- uuid = { version = "1.23", default-features = false, optional = true }
-+# bitflags and log are dependencies for fatfs
-+bitflags = { version = "2", default-features = false, optional = true }
-+log = { version = "0.4", default-features = false, optional = true }
- versions = { path = "./versions" }
- 
- [features]
--chainload = ["dep:fatfs", "dep:uuid"]
-+chainload = ["dep:bitflags", "dep:log", "dep:fatfs", "dep:uuid"]

diff --git a/m1n1.spec b/m1n1.spec
index cab00cf..7b53a18 100644
--- a/m1n1.spec
+++ b/m1n1.spec
@@ -9,7 +9,7 @@
 m1n1 is the bootloader developed by the Asahi Linux project to bridge the Apple
 (XNU) boot ecosystem to the Linux boot ecosystem.}
 
-%global srcversion 1.6.0
+%global srcversion 1.6.1
 
 Name:           m1n1
 Version:        %(echo '%{srcversion}' | tr '-' '~')
@@ -27,8 +27,9 @@ License:        MIT AND CC0-1.0 AND OFL-1.1-RFN AND Zlib AND (BSD-2-Clause OR GP
 URL:            https://github.com/AsahiLinux/m1n1
 Source:         %{url}/archive/v%{srcversion}/%{name}-%{srcversion}.tar.gz
 Source:         https://github.com/rafalh/rust-fatfs/archive/%{fatfs_commit}/rust-fatfs-%{fatfs_commit}.tar.gz
-# * Ensure all required rust dependencies are pulled in
-Patch:          m1n1-rust-deps.patch
+# * Vendor git dependency rust-fatfs and ensure its dependencies are
+#   included as well.
+Patch:          m1n1-1.6.1-rust-deps.patch
 
 BuildRequires:  gcc
 BuildRequires:  make
@@ -98,6 +99,7 @@ This package contains various developer tools for m1n1.
 
 %prep
 %autosetup -N -n %{name}-%{srcversion}
+mkdir -p rust/vendor/rust-fatfs
 tar -xf %{SOURCE1} -C rust/vendor/rust-fatfs --strip-components 1
 %autopatch -p1
 %dnl delete rust/Cargo.lock to avoid the locked versions and drop it from

diff --git a/sources b/sources
index 98b9ca4..11f56a5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (m1n1-1.6.0.tar.gz) = 4f81a61b18c6632013a4220706bfcc63fea16153d04d04a44dbd2ca4030c7fad7fc6345a3a17d1e288358785b0b29b422dc775cdf863a7319a76f762ce37c381
+SHA512 (m1n1-1.6.1.tar.gz) = 9d7f0f27f1104de4a096cb778f71424e3351fc09f3a9d60c60b7e786bd19a149ca57b0fbf79dc83bc2c193e36ce07f050116631d51230209ea3ac89f029bb83b
 SHA512 (rust-fatfs-4eccb50d011146fbed20e133d33b22f3c27292e7.tar.gz) = 28539df26d715d34b5fba861c62115cd4696c4cac4c7a4eb3bafdaf32e7fece49d7b3cdd986c409323e05eab7c0596f6c7dfa63bc2572551f1107b1447cf3711