diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3eb69c2..7d2ce9d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,6 +44,7 @@ jobs: t2fanrd/* linux-apfs-rw/* linux-apfs-rw-kmod/* + t2linux-scripts/* dir_names: "true" - name: "Increase Disk Space" diff --git a/.github/workflows/copr-webhooks.yml b/.github/workflows/copr-webhooks.yml index 876d25a..6731bee 100644 --- a/.github/workflows/copr-webhooks.yml +++ b/.github/workflows/copr-webhooks.yml @@ -15,6 +15,7 @@ on: - "t2fanrd/*" - "linux-apfs-rw/*" - "linux-apfs-rw-kmod/*" + - "t2linux-scripts/*" jobs: copr-webhook: diff --git a/build-packages.sh b/build-packages.sh index d86008b..85a4921 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -2,7 +2,7 @@ set -e if [ "$1" == "all" ]; then - packages=( "t2linux-config" "t2linux-audio" "rust-tiny-dfr" "kernel" "copr-sharpenedblade-t2linux-release" "rust-arraydeque" "rust-nonempty" "rust-rust-ini0.20" "t2fanrd" "linux-apfs-rw" "linux-apfs-rw-kmod" ) + packages=( "t2linux-config" "t2linux-audio" "rust-tiny-dfr" "kernel" "copr-sharpenedblade-t2linux-release" "rust-arraydeque" "rust-nonempty" "rust-rust-ini0.20" "t2fanrd" "linux-apfs-rw" "linux-apfs-rw-kmod" "t2linux-scripts" ) else packages=( "$@" ) fi diff --git a/t2linux-config/t2linux-config.spec b/t2linux-config/t2linux-config.spec index cc65564..e089fd0 100644 --- a/t2linux-config/t2linux-config.spec +++ b/t2linux-config/t2linux-config.spec @@ -1,17 +1,16 @@ Name: t2linux-config -Version: 12.0.0 +Version: 13.0.0 Release: 1%{?dist} Summary: System configuration for linux on t2 macs. License: MIT Requires: t2linux-audio +Requires: t2linux-scripts Recommends: rust-tiny-dfr Recommends: t2fanrd URL: https://t2linux.org -Source1: https://raw.githubusercontent.com/t2linux/wiki/0a60cf22516c49a445c5edd1b3910f158dbc92f5/docs/tools/firmware.sh - %description Configuration and tools for linux on T2 macs. @@ -32,8 +31,6 @@ EOF %install -install -D -m 755 %{SOURCE1} %{buildroot}/%{_bindir}/firmware.sh - install -D -m 644 t2linux-modules-install.conf %{buildroot}/etc/dracut.conf.d/t2linux-modules-install.conf install -D -m 644 t2linux-modules.conf %{buildroot}/etc/modules-load.d/t2linux-modules.conf @@ -48,6 +45,5 @@ grubby --remove-args="pcie_ports=compat" --update-kernel=ALL %files /etc/modules-load.d/t2linux-modules.conf /etc/dracut.conf.d/t2linux-modules-install.conf -%{_bindir}/firmware.sh /etc/udev/rules.d/99-network-t2-ncm.rules /etc/NetworkManager/conf.d/99-network-t2-ncm.conf diff --git a/t2linux-scripts/t2linux-scripts.spec b/t2linux-scripts/t2linux-scripts.spec new file mode 100644 index 0000000..d449da0 --- /dev/null +++ b/t2linux-scripts/t2linux-scripts.spec @@ -0,0 +1,37 @@ +%global wiki_commit fe8c338e6cf1238a390984ba06544833ab8792d3 + +Name: t2linux-scripts +Version: 1.0.0 +Release: 1%{?dist} +Summary: t2linux support scripts +License: MIT +URL: https://wiki.t2linux.org/ +BuildArch: noarch + +BuildRequires: systemd-rpm-macros + +Source0: https://raw.githubusercontent.com/t2linux/wiki/%{wiki_commit}/docs/tools/firmware.sh +Source1: https://raw.githubusercontent.com/t2linux/wiki/%{wiki_commit}/docs/tools/get-apple-firmware.service + +%description +t2linux first boot and support scripts + +%prep + +%build + +cat << EOF > 55-get-apple-firmware.preset +enable get-apple-firmware.service +EOF + +%install + +install -D -m 755 %{SOURCE0} %{buildroot}/%{_libexecdir}/get-apple-firmware +install -D -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/get-apple-firmware.service +install -D -m 644 55-get-apple-firmware.preset %{buildroot}/usr/lib/systemd/system-preset/55-get-apple-firmware.preset + + +%files +%{_libexecdir}/get-apple-firmware +%{_unitdir}/get-apple-firmware.service +/usr/lib/systemd/system-preset/55-get-apple-firmware.preset