From 9c1bd83a62050efa2ade91d71c84c54d3da07913 Mon Sep 17 00:00:00 2001 From: NoaHimesaka1873 Date: Sun, 26 Jun 2022 01:04:20 +0900 Subject: [PATCH] EOS Artemis-T2 commit! --- .../src/modules/copy_kernel/main.py | 2 +- calamares/files/pacman.conf | 8 +++++ calamares/modules/bootloader.conf | 6 ++-- calamares/modules/netinstall-ce-base.yaml | 35 +++++++++---------- calamares/modules/netinstall.yaml | 17 +++++++++ .../modules/shellprocess_fixes_offline.conf | 2 -- .../modules/shellprocess_modify_mk_hook.conf | 8 +---- .../modules/shellprocess_reset_mk_hook.conf | 3 +- calamares/scripts/chrooted_cleaner_script.sh | 2 +- calamares/scripts/cleaner_script.sh | 1 - calamares/scripts/eos-pacman-conf-fix | 8 +++++ 11 files changed, 57 insertions(+), 35 deletions(-) diff --git a/calamares-extra-modules/src/modules/copy_kernel/main.py b/calamares-extra-modules/src/modules/copy_kernel/main.py index f89b98a..e473eca 100644 --- a/calamares-extra-modules/src/modules/copy_kernel/main.py +++ b/calamares-extra-modules/src/modules/copy_kernel/main.py @@ -14,7 +14,7 @@ def run(): """ kernel_path = "/run/archiso/bootmnt/arch/boot/x86_64/" - kernel_root = "vmlinuz" + kernel_root = "vmlinuz-linux-t2" ucode_tail = "ucode.img" root_mount_point = libcalamares.globalstorage.value("rootMountPoint") diff --git a/calamares/files/pacman.conf b/calamares/files/pacman.conf index 7ba282a..467f1d3 100644 --- a/calamares/files/pacman.conf +++ b/calamares/files/pacman.conf @@ -100,6 +100,14 @@ Include = /etc/pacman.d/mirrorlist SigLevel = PackageRequired Include = /etc/pacman.d/endeavouros-mirrorlist +[arch-mact2] +SigLevel = Never +Server = https://mirror.funami.tech/$repo/os/$arch + +[Redecorating-t2] +SigLevel = Never +Server = https://github.com/Redecorating/archlinux-t2-packages/releases/download/packages + # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] diff --git a/calamares/modules/bootloader.conf b/calamares/modules/bootloader.conf index a769756..79ae702 100644 --- a/calamares/modules/bootloader.conf +++ b/calamares/modules/bootloader.conf @@ -6,9 +6,9 @@ efiBootLoader: "grub" -kernel: "/vmlinuz-linux" -img: "/initramfs-linux.img" -fallback: "/initramfs-linux-fallback.img" +kernel: "/vmlinuz-linux-t2" +img: "/initramfs-linux-t2.img" +fallback: "/initramfs-linux-t2-fallback.img" timeout: "5" efiBootloaderId: "endeavouros" diff --git a/calamares/modules/netinstall-ce-base.yaml b/calamares/modules/netinstall-ce-base.yaml index 53b7dde..3798a34 100644 --- a/calamares/modules/netinstall-ce-base.yaml +++ b/calamares/modules/netinstall-ce-base.yaml @@ -194,6 +194,23 @@ - sed - vi - wget +- name: "Extras for Apple T2-based devices" + description: "Device-specific configuration files for Apple T2-based devices. Check https://wiki.t2linux.org for more infomation." + hidden: false + selected: false + critical: true + packages: + - apple-t2-audio-config + - apple-t2-audio-config-alt +- name: "Xanmod Kernel in addition" + description: "Adding Xanmod kernel in addition to main one (Patched to support Macs with T2)" + hidden: false + selected: false + expanded: false + critical: true + packages: + - linux-xanmod-edge-t2-headers + - linux-xanmod-edge-t2-headers - name: "Firefox and language package" description: "Add firefox and language pack if possible" hidden: false @@ -202,24 +219,6 @@ packages: - firefox - firefox-i18n-$LOCALE -- name: "LTS Kernel in addition" - description: "Adding Long Term Supported Kernel in addition to main one" - hidden: false - selected: false - expanded: false - critical: true - packages: - - linux-lts - - linux-lts-headers -- name: "Zen Kernel in addition" - description: "Adding ZEN kernel in addition to main one" - hidden: false - selected: false - expanded: false - critical: true - packages: - - linux-zen - - linux-zen-headers - name: "Printing-Support" description: "Support for printing (Cups)" hidden: false diff --git a/calamares/modules/netinstall.yaml b/calamares/modules/netinstall.yaml index 45923ef..5650543 100644 --- a/calamares/modules/netinstall.yaml +++ b/calamares/modules/netinstall.yaml @@ -194,6 +194,23 @@ - sed - vi - wget +- name: "Extras for Apple T2-based devices" + description: "Device-specific configuration files for Apple T2-based devices. Check https://wiki.t2linux.org for more infomation." + hidden: false + selected: false + critical: true + packages: + - apple-t2-audio-config + - apple-t2-audio-config-alt +- name: "Xanmod Kernel in addition" + description: "Adding Xanmod kernel in addition to main one (Patched to support Macs with T2)" + hidden: false + selected: false + expanded: false + critical: true + packages: + - linux-xanmod-edge-t2-headers + - linux-xanmod-edge-t2-headers - name: "Firefox and language package" description: "Add firefox and language pack if possible" hidden: false diff --git a/calamares/modules/shellprocess_fixes_offline.conf b/calamares/modules/shellprocess_fixes_offline.conf index d61e299..8993cfa 100644 --- a/calamares/modules/shellprocess_fixes_offline.conf +++ b/calamares/modules/shellprocess_fixes_offline.conf @@ -9,8 +9,6 @@ dontChroot: true script: - - "cp /etc/calamares/files/nv-modprobe @@ROOT@@/usr/lib/modprobe.d/nvidia-utils.conf" - - "cp /etc/calamares/files/nv-modules-load @@ROOT@@/usr/lib/modules-load.d/nvidia-utils.conf" - "cp /etc/calamares/files/endeavouros-wallpaper.png @@ROOT@@/usr/share/endeavouros/backgrounds/endeavouros-wallpaper.png" - "cp -a /etc/calamares/scripts @@ROOT@@/etc/calamares/" diff --git a/calamares/modules/shellprocess_modify_mk_hook.conf b/calamares/modules/shellprocess_modify_mk_hook.conf index 08eeb59..b5dc955 100644 --- a/calamares/modules/shellprocess_modify_mk_hook.conf +++ b/calamares/modules/shellprocess_modify_mk_hook.conf @@ -10,13 +10,7 @@ dontChroot: true script: - - "mkdir -p /etc/pacman.d/hooks/" - - "cp /etc/calamares/scripts/90-mkinitcpio-install.hook /etc/pacman.d/hooks/" - - "mkdir -p @@ROOT@@/usr/share/libalpm/scripts/" - - "cp /etc/calamares/scripts/mkinitcpio-install-calamares @@ROOT@@/usr/share/libalpm/scripts/" - - "chmod +x @@ROOT@@/usr/share/libalpm/scripts/mkinitcpio-install-calamares" - - "mkdir -p @@ROOT@@/etc/pacman.d/hooks/" - - "cp /etc/calamares/scripts/90-mkinitcpio-install.hook @@ROOT@@/etc/pacman.d/hooks/" + - "echo ''" i18n: name: "modify 90-mkinitcpio-install.hook on host and chroot" diff --git a/calamares/modules/shellprocess_reset_mk_hook.conf b/calamares/modules/shellprocess_reset_mk_hook.conf index bed8f03..8039faa 100644 --- a/calamares/modules/shellprocess_reset_mk_hook.conf +++ b/calamares/modules/shellprocess_reset_mk_hook.conf @@ -7,8 +7,7 @@ dontChroot: false script: - - "rm /etc/pacman.d/hooks/90-mkinitcpio-install.hook" - - "rm /usr/share/libalpm/scripts/mkinitcpio-install-calamares" + - "echo ''" i18n: name: "reset 90-mkinitcpio-install.hook" diff --git a/calamares/scripts/chrooted_cleaner_script.sh b/calamares/scripts/chrooted_cleaner_script.sh index d0ab047..f118f7a 100644 --- a/calamares/scripts/chrooted_cleaner_script.sh +++ b/calamares/scripts/chrooted_cleaner_script.sh @@ -614,7 +614,7 @@ Main() { _clean_up _run_hotfix_end - rm -rf /etc/calamares /opt/extra-drivers + rm -rf /etc/calamares _c_c_s_msg info "$filename done." } diff --git a/calamares/scripts/cleaner_script.sh b/calamares/scripts/cleaner_script.sh index 9b90f02..85c02e1 100644 --- a/calamares/scripts/cleaner_script.sh +++ b/calamares/scripts/cleaner_script.sh @@ -107,7 +107,6 @@ _copy_files(){ touch $target/tmp/r8168_in_use fi - _manage_broadcom_wifi_driver # copy endeavouros-release file local file=/usr/lib/endeavouros-release diff --git a/calamares/scripts/eos-pacman-conf-fix b/calamares/scripts/eos-pacman-conf-fix index 0d22ecc..c80ae98 100644 --- a/calamares/scripts/eos-pacman-conf-fix +++ b/calamares/scripts/eos-pacman-conf-fix @@ -23,6 +23,14 @@ Main() SigLevel = PackageRequired Include = /etc/pacman.d/endeavouros-mirrorlist +[arch-mact2] +SigLevel = Never +Server = https://mirror.funami.tech/arch-mact2/os/x86_64 + +[Redecorating-t2] +Server = https://github.com/Redecorating/archlinux-t2-packages/releases/download/packages +SigLevel = Optional TrustAll + EOF # Make other adjustments in pacman.conf: