diff --git a/device/testing/m1n1-apple-idevice/0001-vendor-dependencies-with-cargo-instead-of-git.patch b/device/testing/m1n1-apple-idevice/0001-vendor-dependencies-with-cargo-instead-of-git.patch index b2730aa6a..e173632c0 100644 --- a/device/testing/m1n1-apple-idevice/0001-vendor-dependencies-with-cargo-instead-of-git.patch +++ b/device/testing/m1n1-apple-idevice/0001-vendor-dependencies-with-cargo-instead-of-git.patch @@ -1,33 +1,27 @@ -From 4fa0cb9d3ae9231e30862083d6e112b01fd3eb66 Mon Sep 17 00:00:00 2001 +From 39aefd78402169b223f581c1f6b40200f8ee417b Mon Sep 17 00:00:00 2001 From: Aster Boese -Date: Sun, 13 Jul 2025 21:38:27 -0400 -Subject: [PATCH] vendor dependencies with cargo instead of git +Date: Sat, 17 Jan 2026 14:54:54 -0500 +Subject: [PATCH] rust vendor deps with git +Signed-off-by: Aster Boese --- - rust/Cargo.lock | 22 +++++++++++----------- - rust/Cargo.toml | 8 +------- - 2 files changed, 12 insertions(+), 18 deletions(-) + rust/Cargo.lock | 13 +++++++------ + rust/Cargo.toml | 2 +- + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock -index ac41e15..0f70999 100644 +index 077e0d5..68fb51e 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock -@@ -1,18 +1,17 @@ - # This file is automatically @generated by Cargo. - # It is not intended for manual editing. --version = 3 -+version = 4 +@@ -4,13 +4,14 @@ version = 4 [[package]] name = "bitflags" --version = "1.3.2" -- --[[package]] --name = "cfg-if" --version = "1.0.0" -+version = "2.9.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +-version = "2.9.2" ++version = "2.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6a65b545ab31d687cff52899d4890855fec459eb6afe0da6417b8a18da87aa29" ++checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3" [[package]] name = "fatfs" @@ -36,45 +30,42 @@ index ac41e15..0f70999 100644 dependencies = [ "bitflags", "log", -@@ -20,10 +19,9 @@ dependencies = [ +@@ -18,9 +19,9 @@ dependencies = [ [[package]] name = "log" --version = "0.4.17" --dependencies = [ -- "cfg-if", --] -+version = "0.4.27" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +-version = "0.4.27" ++version = "0.4.29" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" ++checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" [[package]] name = "rust" -@@ -35,4 +33,6 @@ dependencies = [ +@@ -33,9 +34,9 @@ dependencies = [ [[package]] name = "uuid" --version = "1.7.0" -+version = "1.17.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d" +-version = "1.18.0" ++version = "1.19.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f33196643e165781c20a5ead5582283a7dacbb87855d867fbc2df3f81eddc1be" ++checksum = "e2e054861b4bd027cd373e18e8d8d8e6548085000e41290d95ce0c373a654b4a" + + [[package]] + name = "versions" diff --git a/rust/Cargo.toml b/rust/Cargo.toml -index 39229e9..1f1126d 100644 +index c86cfd9..1e963cd 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml -@@ -11,11 +11,5 @@ crate-type = [ "staticlib" ] +@@ -11,6 +11,6 @@ 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"] } +fatfs = { git = "https://github.com/rafalh/rust-fatfs.git", rev = "4eccb50d011146fbed20e133d33b22f3c27292e7", default-features = false, features = ["lfn", "alloc"] } uuid = { version = "1.7.0", default-features = false } -- --[patch.crates-io] --uuid = { path = "vendor/uuid" } --log = { path = "vendor/log" } --bitflags = { path = "vendor/bitflags" } --cfg-if = { path = "vendor/cfg-if" } + versions = { path = "./versions" } -- -2.50.1 +2.52.0 diff --git a/device/testing/m1n1-apple-idevice/APKBUILD b/device/testing/m1n1-apple-idevice/APKBUILD index ed1a6b6bc..6a4fb8036 100644 --- a/device/testing/m1n1-apple-idevice/APKBUILD +++ b/device/testing/m1n1-apple-idevice/APKBUILD @@ -1,8 +1,8 @@ maintainer="Aster Boese " pkgname=m1n1-apple-idevice _pkgname=m1n1 -pkgver=1.4.21_git20250805 -_commit="8d18e2eca29abe47b216438608b454f69aabd538" +pkgver=1.5.0_git20260114 +_commit="19d973c873ad3f5396a23faaeb721b305b3d3cc1" pkgrel=0 pkgdesc="m1n1 bootloader for Apple Generic iDevice" url="https://github.com/HoolockLinux/m1n1" @@ -119,6 +119,6 @@ udev() { } sha512sums=" -749f90a89547ce7b5d6cad5d3d1bdfde0a80a04796feae10f6d1ddd0341f97826b00852981d95187cdc7ea81949d34942b12d83204488d3c0d871b9207784f3d 8d18e2eca29abe47b216438608b454f69aabd538.tar.gz -ae5b1baed8a6d48e28e3e0db1840c4bfacb34e9b6c4c614e5275a672b04687f135f348aab612d918d2778521efaa1215bb5c071034f222798dd7865d2952d9e9 0001-vendor-dependencies-with-cargo-instead-of-git.patch +0041e9f36aed9feda59e906a8468ff7c8b5284a8c06770884e10e5887f9351f0b805c20249b4f6838a2c59ae5c3ce46e0192dfdababd4a56abfb763c8dce9edf 19d973c873ad3f5396a23faaeb721b305b3d3cc1.tar.gz +a3c4076c47761b1cb2b546a206148945209136b0ea376e1e332f61f91f2d79f5a2e9ce6d6ffd1079bcc49fda37c502dad5d58ae7bc4be270d9d1d8f172fc7b55 0001-vendor-dependencies-with-cargo-instead-of-git.patch "