The package rpms/asahi-installer.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/asahi-installer.git/commit/?id=d6378....
Change: +%ifarch aarch64
Thanks.
Full change: ============
commit d6378bfa76b84e2ac1c168d9179fb09fdd5f265e Author: Davide Cavalca dcavalca@fedoraproject.org Date: Mon May 13 15:33:57 2024 -0700
Build macOS installer package on aarch64
diff --git a/.gitignore b/.gitignore index a44a922..f073611 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,7 @@ /asahi-installer-0.6.5.tar.gz /asahi-installer-0.6.7.tar.gz /asahi-installer-0.6.9.tar.gz +/python-3.9.6-macos11.pkg +/libffi-3.4.6-macos.tar.gz /asahi-installer-0.7.5.tar.gz /asahi-installer-0.7.8.tar.gz diff --git a/asahi-installer.spec b/asahi-installer.spec index c0bd644..f089550 100644 --- a/asahi-installer.spec +++ b/asahi-installer.spec @@ -4,6 +4,14 @@ # it doesn't ship any binary objects itself %global debug_package %{nil}
+# The installer package for macOS depends on m1n1-stage1, which is only +# available on aarch64 +%ifarch aarch64 +%bcond installer_package 1 +%else +%bcond installer_package 0 +%endif + # For the generated library symbol suffix %if 0%{?__isa_bits} == 32 %global libsymbolsuffix %{nil} @@ -11,8 +19,20 @@ %global libsymbolsuffix ()(%{__isa_bits}bit) %endif
+# This should match the version in asahi_firmware/img4.py %global liblzfse_majver 1
+# These should match the versions in build.sh +%global installer_libffi_version 3.4.6 +%global installer_python_version 3.9.6 +%global installer_python_asn1_version 2.5.0 + +# These are prebuilt binary macOS packages. We cannot build them in Fedora +# because that requires macOS itself and other proprietary tools. +# FESCo exception: https://pagure.io/fesco/issue/3212 +%global installer_libffi_package libffi-%{installer_libffi_version}-macos.tar.gz +%global installer_python_package python-%{installer_python_version}-macos11.pkg + Name: asahi-installer Version: 0.7.8 Release: %autorelease @@ -20,12 +40,35 @@ Summary: Asahi Linux installer
License: MIT URL: https://github.com/AsahiLinux/asahi-installer -Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz - +Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz +# This is a libffi build for macOS from Homebrew +# https://formulae.brew.sh/formula/libffi +# See the logic in build.sh for how it's downloaded +Source1: %{installer_libffi_package} +# This is an official upstream build of the Python interpeter for macOS +Source2: https://www.python.org/ftp/python/%%7Binstaller_python_version%7D/%%7Binstal... +Source3: https://www.python.org/ftp/python/%%7Binstaller_python_version%7D/%%7Binstal... +# Per https://www.python.org/downloads/ this is Ned Deily's key, who signs the +# Python release binaries for macOS +Source4: https://keybase.io/nad/pgp_keys.asc?fingerprint=0d96df4d4110e5c43fbfb17f2d34... + +BuildRequires: gnupg2 BuildRequires: python3-devel - BuildRequires: python3dist(asn1)
+%if %{with installer_package} +BuildRequires: bash +BuildRequires: cpio +BuildRequires: coreutils +BuildRequires: fedora-logos +BuildRequires: gzip +BuildRequires: m1n1-stage1 +BuildRequires: p7zip-plugins +BuildRequires: python3 +BuildRequires: python3dist(certifi) +BuildRequires: tar +%endif + # LZFSE isn't supported on big-endian architectures # https://github.com/lzfse/lzfse/issues/23 ExcludeArch: s390x @@ -33,6 +76,22 @@ ExcludeArch: s390x %description Asahi Linux installer
+%if %{with installer_package} +%package package +Summary: Asahi Linux Installer macOS package +# The installer itself is MIT, and so are the vendored libffi and python-asn1. +# The rest comes from m1n1-stage1 and Python. +License: MIT AND (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 (Apache-2.0 OR MIT) AND MIT AND (MIT OR Apache-2.0)) AND Python + +# These are vendored macOS dependencies that are included in the installer +Provides: bundled(libffi) = %{installer_libffi_version} +Provides: bundled(python) = %{installer_python_version} +Provides: bundled(python-asn1) = %{installer_python_asn1_version} + +%description package +macOS package for the Asahi Linux installer +%endif + %package -n python3-%{pypi_name} Summary: Asahi Linux firmware tools
@@ -46,22 +105,49 @@ Asahi Linux firmware tools
%prep %autosetup -p1 -# Drop bundled asn1 module in favor of the system one -rm asahi_firmware/asn1.py +%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE3}' --data='%{SOURCE2}' + +# Set version +echo "%{version}" > version.tag + +# Put the binary packages where the build script expects them +mkdir -p dl +ln -s %SOURCE1 %SOURCE2 dl/
%generate_buildrequires %pyproject_buildrequires -r
%build +%if %{with installer_package} +M1N1_STAGE1="%{_libdir}/m1n1-stage1/m1n1.bin" \ +LOGO="%{_datadir}/pixmaps/bootloader/fedora.icns" \ + ./build.sh +%endif + +# Drop bundled asn1 module in favor of the system one; we do this here because +# the macOS package needs it. +rm asahi_firmware/asn1.py + %pyproject_wheel
%install %pyproject_install %pyproject_save_files %{pypi_name}
+%if %{with installer_package} +install -Dpm0644 -t %{buildroot}%{_libdir}/%{name}/releases releases/* +%endif + %check %pyproject_check_import
+%if %{with installer_package} +%files package +%license LICENSE +%doc README.md +%{_libdir}/%{name}/ +%endif + %files -n python3-%{pypi_name} -f %{pyproject_files} %license LICENSE %doc README.md diff --git a/key.asc b/key.asc new file mode 100644 index 0000000..ecadb62 --- /dev/null +++ b/key.asc @@ -0,0 +1,153 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +48Kp +=ffoA +-----END PGP PUBLIC KEY BLOCK----- diff --git a/python-3.9.6-macos11.pkg.asc b/python-3.9.6-macos11.pkg.asc new file mode 100644 index 0000000..63a4000 --- /dev/null +++ b/python-3.9.6-macos11.pkg.asc @@ -0,0 +1,16 @@
diff --git a/sources b/sources index bf843f4..3258c99 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ SHA512 (asahi-installer-0.7.8.tar.gz) = f89563ff8c596e77b8ad34634a651f1881f0e8680bc10a6dd1b4f55755a5489b790ffb9d3a57a392ade3c92873a503db3e4c59309f3d9f553a8999294bef32ac +SHA512 (libffi-3.4.6-macos.tar.gz) = 84ad900bc28258a7617850612790150fb639496cb8e8bea1a96e75ecc5b678e29522c415973950a84b21adac239f3fbb6361850d2625e5072a5f341b3feb5035 +SHA512 (python-3.9.6-macos11.pkg) = a1fd7a4031f12ebabd5a6b33206257a322cdcbfa011b4e2e4b1438dae0eca4216868d8bc646ec00b789d5521f30972c12dac8736b48d8b094ce05e5b63905481
commit a98bdf19c87d93b1d31b4f96f910c7e50fef0d34 Author: Davide Cavalca dcavalca@fedoraproject.org Date: Wed Jul 31 10:21:14 2024 -0700
Update to 0.7.8; Fixes: RHBZ#2281444
diff --git a/.gitignore b/.gitignore index 7552c3a..a44a922 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /asahi-installer-0.6.7.tar.gz /asahi-installer-0.6.9.tar.gz /asahi-installer-0.7.5.tar.gz +/asahi-installer-0.7.8.tar.gz diff --git a/asahi-installer.spec b/asahi-installer.spec index 8249f16..c0bd644 100644 --- a/asahi-installer.spec +++ b/asahi-installer.spec @@ -14,7 +14,7 @@ %global liblzfse_majver 1
Name: asahi-installer -Version: 0.7.5 +Version: 0.7.8 Release: %autorelease Summary: Asahi Linux installer
@@ -23,7 +23,6 @@ URL: https://github.com/AsahiLinux/asahi-installer Source: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
BuildRequires: python3-devel -BuildRequires: sed
BuildRequires: python3dist(asn1)
@@ -47,11 +46,8 @@ Asahi Linux firmware tools
%prep %autosetup -p1 -# Replace bundled asn1 module with the system one and fix soname for liblzfse +# Drop bundled asn1 module in favor of the system one rm asahi_firmware/asn1.py -sed -i asahi_firmware/img4.py \ - -e 's/from . import asn1/import asn1/' \ - -e 's/liblzfse.so/liblzfse.so.%{liblzfse_majver}/'
%generate_buildrequires %pyproject_buildrequires -r diff --git a/sources b/sources index b9cc957..bf843f4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (asahi-installer-0.7.5.tar.gz) = b2ea06268576067bf5787bb43d3d6b6140c2fac39256772a457e11e1b48948440ea406aa2a996a374bf4aceb9de7fe679fc457aa807faf5b1f4e72ad33279af1 +SHA512 (asahi-installer-0.7.8.tar.gz) = f89563ff8c596e77b8ad34634a651f1881f0e8680bc10a6dd1b4f55755a5489b790ffb9d3a57a392ade3c92873a503db3e4c59309f3d9f553a8999294bef32ac
commit bcb254ab3e2b65e0f84c86cdcac2d9b8bd6bd6c2 Author: Fedora Release Engineering releng@fedoraproject.org Date: Wed Jul 17 17:29:07 2024 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
commit 5225d57e5737dd11db425f1b56e38ae598278732 Author: Python Maint python-maint@redhat.com Date: Fri Jun 7 19:22:29 2024 +0200
Rebuilt for Python 3.13
commit 78e6eb37f52b3f91a718b531f0c03f815c989104 Author: Davide Cavalca dcavalca@fedoraproject.org Date: Mon May 13 15:33:57 2024 -0700
Update to 0.7.5; Fixes: RHBZ#2243738
diff --git a/.gitignore b/.gitignore index 85ef4e1..7552c3a 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /asahi-installer-0.6.5.tar.gz /asahi-installer-0.6.7.tar.gz /asahi-installer-0.6.9.tar.gz +/asahi-installer-0.7.5.tar.gz diff --git a/asahi-installer.spec b/asahi-installer.spec index 4d7f8a8..8249f16 100644 --- a/asahi-installer.spec +++ b/asahi-installer.spec @@ -14,7 +14,7 @@ %global liblzfse_majver 1
Name: asahi-installer -Version: 0.6.9 +Version: 0.7.5 Release: %autorelease Summary: Asahi Linux installer
@@ -53,9 +53,6 @@ sed -i asahi_firmware/img4.py \ -e 's/from . import asn1/import asn1/' \ -e 's/liblzfse.so/liblzfse.so.%{liblzfse_majver}/'
-# Remove bundled macOS libraries we don't need -rm -r vendor - %generate_buildrequires %pyproject_buildrequires -r
diff --git a/sources b/sources index 4db46bf..b9cc957 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (asahi-installer-0.6.9.tar.gz) = e4e3ee6767074526cea44893144d1735de213fd3b472937f1b8a5494c90fb1ab8c7fc29aee760d648ecc10cf8685c206284ffe55595755f5373428ec35baea98 +SHA512 (asahi-installer-0.7.5.tar.gz) = b2ea06268576067bf5787bb43d3d6b6140c2fac39256772a457e11e1b48948440ea406aa2a996a374bf4aceb9de7fe679fc457aa807faf5b1f4e72ad33279af1
commit 8b2c901cac41eded44a225a660629b95a0ab9b7e Author: Fedora Release Engineering releng@fedoraproject.org Date: Mon Jan 22 23:29:39 2024 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
commit be0aa5584bf78bf311f0be7742b34475bb791b86 Author: Fedora Release Engineering releng@fedoraproject.org Date: Fri Jan 19 13:35:43 2024 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild