public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/m1n1] rawhide: Bump to GPL-2.0 or later licensed m1n1 2.0.1
@ 2026-11-21 20:36 Janne Grunau
0 siblings, 0 replies; only message in thread
From: Janne Grunau @ 2026-11-21 20:36 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/m1n1
Branch : rawhide
Commit : 702094a379a01d2b504786a599656b266dcd730b
Author : Janne Grunau <janne-fdr@jannau.net>
Date : 2026-11-21T20:56:47+01:00
Stats : +29/-95 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/m1n1/c/702094a379a01d2b504786a599656b266dcd730b?branch=rawhide
Log:
Bump to GPL-2.0 or later licensed m1n1 2.0.1
- M3, M3 Pro and M3 Max DCP support
- Init atcphy* and touchbar0 without devicetree aliases for Linux v7.5 compatibility
---
diff --git a/.gitignore b/.gitignore
index 0c08799..fe51114 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,4 @@
/rust-fatfs-4eccb50d011146fbed20e133d33b22f3c27292e7.tar.gz
/m1n1-1.6.1.tar.gz
/m1n1-1.9.9.tar.gz
+/m1n1-2.0.1.tar.gz
diff --git a/m1n1-1.9.9-rust-deps.patch b/m1n1-1.9.9-rust-deps.patch
deleted file mode 100644
index 4faab82..0000000
--- a/m1n1-1.9.9-rust-deps.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git i/rust/Cargo.toml w/rust/Cargo.toml
-index 9719fe8d..0b0d4eea 100644
---- i/rust/Cargo.toml
-+++ w/rust/Cargo.toml
-@@ -11,10 +11,13 @@ 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 }
-+fatfs = { path = "vendor/rust-fatfs", default-features = false, features = ["lfn", "alloc"], optional = true }
- sha1_smol = { version = "1.0.1" }
- uuid = { version = "1.23", default-features = false, optional = true }
- versions = { path = "./versions" }
-+# bitflags and log are dependencies for fatfs
-+bitflags = { version = "2", default-features = false, optional = true }
-+log = { version = "0.4", default-features = false, optional = true }
-
- [features]
--chainload = ["dep:fatfs", "dep:uuid"]
-+chainload = ["dep:bitflags", "dep:log", "dep:fatfs", "dep:uuid"]
diff --git a/m1n1-2.0.1-rust-deps.patch b/m1n1-2.0.1-rust-deps.patch
new file mode 100644
index 0000000..5042262
--- /dev/null
+++ b/m1n1-2.0.1-rust-deps.patch
@@ -0,0 +1,20 @@
+diff --git i/rust/Cargo.toml w/rust/Cargo.toml
+index 1fff9d6e..4117d2d1 100644
+--- i/rust/Cargo.toml
++++ w/rust/Cargo.toml
+@@ -11,10 +11,13 @@ 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 }
++fatfs = { path = "vendor/rust-fatfs", default-features = false, features = ["lfn", "alloc"], optional = true }
+ sha1_smol = { version = "1.0.1" }
+ uuid = { version = "1.23", default-features = false, optional = true }
+ versions = { path = "./versions" }
++# bitflags and log are dependencies for fatfs
++bitflags = { version = "2", default-features = false, optional = true }
++log = { version = "0.4", default-features = false, optional = true }
+
+ [features]
+-chainload = ["dep:fatfs", "dep:uuid"]
++chainload = ["dep:bitflags", "dep:log", "dep:fatfs", "dep:uuid"]
diff --git a/m1n1.spec b/m1n1.spec
index 0c38ae9..996e351 100644
--- a/m1n1.spec
+++ b/m1n1.spec
@@ -9,31 +9,28 @@
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.9.9
+%global srcversion 2.0.1
Name: m1n1
Version: %(echo '%{srcversion}' | tr '-' '~')
Release: %autorelease
Summary: Bootloader and experimentation playground for Apple Silicon
-# m1n1 proper is MIT licensed, but it relies on a number of vendored projects
+# m1n1 proper is GPL 2.0 or latater licensed, but it relies on a number of
+# vendored projects
# See the "License" section in README.md for the breakdown
#
# The following breakdown only covers the rust dependencies
# MIT
# MIT OR Apache-2.0
# LICENSE.dependencies contains a full license breakdown of the rust dependencies
-License: MIT AND CC0-1.0 AND OFL-1.1-RFN AND Zlib AND (BSD-2-Clause OR GPL-2.0-or-later) AND (BSD-3-Clause OR GPL-2.0-or-later) AND MIT AND (MIT OR Apache-2.0)
+License: GPL-2.0-or-later AND CC0-1.0 AND OFL-1.1-RFN AND Zlib AND (BSD-2-Clause OR GPL-2.0-or-later) AND (BSD-3-Clause OR GPL-2.0-or-later) AND MIT AND (MIT OR Apache-2.0)
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
# * Vendor git dependency rust-fatfs and ensure its dependencies are
# included as well.
-Patch: m1n1-1.9.9-rust-deps.patch
-# https://github.com/AsahiLinux/m1n1/pull/703 "rust: Add workaround for rust 1.99.0 regression"
-Patch10: pr-703-rust-1.99-workaround.patch
-# https://github.com/AsahiLinux/m1n1/pull/704 "display: Limit M1/M2 Sequoia DCP power-cycle to M1/M2"
-Patch11: pr-704-display-m3-imac-fixes.patch
+Patch: m1n1-2.0.1-rust-deps.patch
BuildRequires: gcc
BuildRequires: make
@@ -78,7 +75,7 @@ Summary: %{summary}
# BSD-3-Clause
# MIT
# MIT OR Apache-2.0
-License: MIT AND CC0-1.0 AND OFL-1.1-RFN AND Zlib AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-3-Clause AND (BSD-3-Clause OR GPL-2.0-or-later) AND (Apache-2.0 OR MIT) AND MIT
+License: GPL-2.0-or-later AND CC0-1.0 AND OFL-1.1-RFN AND Zlib AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-3-Clause AND (BSD-3-Clause OR GPL-2.0-or-later) AND (Apache-2.0 OR MIT) AND MIT
# LICENSE.dependencies contains a full license breakdown of the rust dependencies
# This is vendored and statically linked into m1n1 when building for stage 1
@@ -91,7 +88,7 @@ Installer.
%package tools
Summary: Developer tools for m1n1
-License: MIT
+License: GPL-2.0-or-later
Requires: %{name} = %{version}-%{release}
Requires: python3
Requires: python3dist(construct)
diff --git a/pr-703-rust-1.99-workaround.patch b/pr-703-rust-1.99-workaround.patch
deleted file mode 100644
index 071df30..0000000
--- a/pr-703-rust-1.99-workaround.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 175f1a9ddf4a9e2e312f08ad6cd0162f0b418341 Mon Sep 17 00:00:00 2001
-From: Janne Grunau <j@jannau.net>
-Date: Fri, 9 Oct 2026 17:34:53 +0200
-Subject: [PATCH] rust: Add workaround for rust 1.99.0 regression.
-
-librust.a fails to link with "undefined reference to `wcslen'" caused by
-LLVM 23 regression reported in [1]. Add
-"-C llvm-args=-disable-loop-idiom-wcslen" to RUSTFLAGS to workaround
-this bug.
-
-Link: https://github.com/rust-lang/rust/issues/163614 [1]
-Signed-off-by: Janne Grunau <j@jannau.net>
----
- Makefile | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index b3a420431..2f3845bdc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -81,6 +81,9 @@ else
- CARGO_FLAGS :=
- endif
-
-+# workaround https://github.com/rust-lang/rust/issues/163614 LLVM 23 regression in rust 1.99.0
-+CARGO_RUSTFLAGS := --config 'build.rustflags = ["-C", "llvm-args=-disable-loop-idiom-wcslen"]'
-+
- ifeq ($(CHAINLOADING),1)
- CFG += CHAINLOADING
- CARGO_FLAGS += --features chainload
-@@ -228,7 +231,7 @@ build/$(RUST_LIB): src/../build/build_cfg.h rust/src/*.rs rust/src/gpu/*.rs rust
- $(QUIET)echo " RS $@"
- $(QUIET)mkdir -p $(DEPDIR)
- $(QUIET)mkdir -p "$(dir $@)"
-- $(QUIET)cargo build $(CARGO_FLAGS) --target $(RUSTARCH) --lib --release --manifest-path rust/Cargo.toml --target-dir build
-+ $(QUIET)cargo build $(CARGO_RUSTFLAGS) $(CARGO_FLAGS) --target $(RUSTARCH) --lib --release --manifest-path rust/Cargo.toml --target-dir build
- $(QUIET)cp "build/$(RUSTARCH)/release/${RUST_LIB}" "$@"
-
- build/%.o: src/%.S
diff --git a/pr-704-display-m3-imac-fixes.patch b/pr-704-display-m3-imac-fixes.patch
deleted file mode 100644
index 2ea6b66..0000000
--- a/pr-704-display-m3-imac-fixes.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 79e8e62f662cab166fb8d28288f40d5863b52114 Mon Sep 17 00:00:00 2001
-From: Janne Grunau <j@jannau.net>
-Date: Fri, 9 Oct 2026 18:07:44 +0200
-Subject: [PATCH] display: Limit M1/M2 Sequoia DCP power-cycle to M1/M2
-
-The `!has_notch` check doesn't exclude 24-inch iMacs with M3 and later.
-
-Signed-off-by: Janne Grunau <j@jannau.net>
----
- src/display.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/display.c b/src/display.c
-index de53a398c..b7d26dec3 100644
---- a/src/display.c
-+++ b/src/display.c
-@@ -658,7 +658,7 @@ int display_init(void)
- fb_clear_direct(); // Old m1n1 stage1 ends up with an ugly logo situation, clear it.
- return display_configure(NULL);
- #ifndef CHAINLOADING
-- } else if (!has_notch && firmware_sfw_in_range(V15_0B1, FW_MAX) &&
-+ } else if (!has_notch && chip_id <= T8112 && firmware_sfw_in_range(V15_0B1, FW_MAX) &&
- os_firmware.version < V15_0B1) {
- printf("display: Internal display on t8103 or t8112 with Sequoia SFW, power cycling\n");
- display_needs_power_cycle = true;
diff --git a/sources b/sources
index 29bef6e..8d74db9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (m1n1-1.9.9.tar.gz) = 84946340c7b077c69dd3dbcb0d963a2a5e249e8fc0ad9b39dbf0204f5209587a785000e441799a0c58761603e02043fc149438fac9e796f71b678e164b233763
+SHA512 (m1n1-2.0.1.tar.gz) = f8dadedc6eef51d273c7546fa9fdd550c4f53709bf35429712d2e85a0fad128bb101dc4ffe96ca7d62c7a6f268a95e6f6177c9c3ede79ad24b12655f7916bf5f
SHA512 (rust-fatfs-4eccb50d011146fbed20e133d33b22f3c27292e7.tar.gz) = 28539df26d715d34b5fba861c62115cd4696c4cac4c7a4eb3bafdaf32e7fece49d7b3cdd986c409323e05eab7c0596f6c7dfa63bc2572551f1107b1447cf3711
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-11-21 20:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-21 20:36 [rpms/m1n1] rawhide: Bump to GPL-2.0 or later licensed m1n1 2.0.1 Janne Grunau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox