Skip to content

Commit f3ec273

Browse files
NoaHimesaka1873NoaHimesaka1873
committed
Galileo-T2
1 parent a96d86b commit f3ec273

File tree

15 files changed

+127
-51
lines changed

15 files changed

+127
-51
lines changed

‎.github/workflows/BuildISO.yml

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
name: Build EndeavourOS ISO
2+
on: [push, pull_request, workflow_dispatch]
3+
jobs:
4+
build:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- name: Checkout Repo
8+
if: ${{ !contains(github.event.head_commit.message, '[no build]') }}
9+
uses: actions/checkout@v2
10+
- name: Build In Docker
11+
if: ${{ !contains(github.event.head_commit.message, '[no build]') }}
12+
run: |
13+
cat << \EOF > entrypoint.sh
14+
pacman -Syu base base-devel reflector --needed --noconfirm
15+
reflector --verbose --country $(curl https://ipv4.myip.wtf/text/country) --protocol http,https --latest 10 --sort rate --save /etc/pacman.d/mirrorlist
16+
pacman-key --init
17+
pacman -Syu wget --needed --noconfirm
18+
pacman -Syu archlinux-keyring --noconfirm
19+
cd /etc/pacman.d/
20+
touch endeavouros-mirrorlist
21+
echo "Server = https://mirror.funami.tech/endeavouros/repo/\$repo/\$arch" > endeavouros-mirrorlist
22+
echo "Server = https://mirror.jingk.ai/endeavouros/repo/\$repo/\$arch" >> endeavouros-mirrorlist
23+
cat endeavouros-mirrorlist
24+
cd ..
25+
printf "\n" >> pacman.conf
26+
echo "[endeavouros]" >> pacman.conf
27+
echo "SigLevel = Never" >> pacman.conf
28+
echo "Include = /etc/pacman.d/endeavouros-mirrorlist" >> pacman.conf
29+
printf "\n" >> pacman.conf
30+
cat pacman.conf
31+
wget https://raw.githubusercontent.com/endeavouros-team/keyring/main/endeavouros.gpg -O endeavouros.gpg
32+
wget https://mirror.funami.tech/endeavouros/repo/endeavouros/x86_64/endeavouros-keyring-20230523-1-any.pkg.tar.zst
33+
pacman -U endeavouros-keyring-20230523-1-any.pkg.tar.zst --noconfirm --needed
34+
pacman-key --add endeavouros.gpg && sudo pacman-key --lsign-key 497AF50C92AD2384C56E1ACA003DB8B0CB23504F
35+
pacman-key --populate
36+
pacman-key --recv-keys 8BE1FEE14302371DEF6F910A0E5877AC225D1980 --keyserver hkps://keyserver.ubuntu.com
37+
pacman-key --lsign-key 8BE1FEE14302371DEF6F910A0E5877AC225D1980
38+
pacman-key --populate
39+
pacman -Syu
40+
pacman-key --populate
41+
pacman-key --populate archlinux
42+
cd /build
43+
useradd builduser -m
44+
passwd -d builduser
45+
pacman -Syu --noconfirm --needed sudo git base-devel
46+
pacman -S archiso mkinitcpio-archiso git squashfs-tools --needed --noconfirm
47+
printf "builduser ALL=NOPASSWD: ALL\n" | tee -a /etc/sudoers
48+
chown -R builduser:builduser ./
49+
sudo -u builduser bash ./prepare.sh
50+
./mkarchiso "."
51+
EOF
52+
53+
54+
55+
56+
docker run --privileged -t -v $PWD:/build archlinux /bin/bash /build/entrypoint.sh
57+
58+
- name: Upload Built ISO
59+
if: ${{ github.ref == 'refs/heads/galileo' && !contains(github.event.head_commit.message, '[no rel]') && !contains(github.event.head_commit.message, '[no build]') }}
60+
uses: actions/upload-artifact@v2
61+
with:
62+
name: built-iso
63+
path: ${{ github.workspace }}/out/*.iso
64+
- name: Create Tag
65+
id: create_tag
66+
if: ${{ github.ref == 'refs/heads/galileo' && !contains(github.event.head_commit.message, '[no rel]') && !contains(github.event.head_commit.message, '[no build]') }}
67+
run: |
68+
export TAG=$(date +%Y.%m.%d)
69+
echo "::set-output name=tag::${TAG}"
70+
echo $TAG
71+
- name: Release
72+
if: ${{ github.ref == 'refs/heads/galileo' && !contains(github.event.head_commit.message, '[no rel]') && !contains(github.event.head_commit.message, '[no build]') }}
73+
uses: softprops/action-gh-release@v1
74+
with:
75+
files: |
76+
${{ github.workspace }}/out/*.iso
77+
tag_name: ${{ steps.create_tag.outputs.tag }}
78+
name: ${{ steps.create_tag.outputs.tag }}
79+
draft: ${{ contains(github.event.head_commit.message, '[draft]') }}
80+
prerelease: ${{ contains(github.event.head_commit.message, '[prerel]') }}
81+
body: |
82+
Follow [this guide](https://wiki.t2linux.org/distributions/endeavouros/installation/) using this ISO to install EndeavourOS on your T2 Mac
83+
env:
84+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/gitlab.yml

-17
This file was deleted.

‎airootfs/etc/hostname

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#
22
# SPDX-License-Identifier: GPL-3.0-or-later
3-
EndeavourOS
3+
EndeavourOS-T2

‎airootfs/etc/mkinitcpio.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# run. Advanced users may wish to specify all system modules
55
# in this array. For instance:
66
# MODULES=(piix ide_disk reiserfs)
7-
MODULES=(vmd)
7+
MODULES=(vmd apple-bce)
88

99
# BINARIES
1010
# This setting includes any additional binaries a given user may

‎airootfs/etc/mkinitcpio.d/linux.preset

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
PRESETS=('archiso')
77

8-
ALL_kver='/boot/vmlinuz-linux'
8+
ALL_kver='/boot/vmlinuz-linux-t2'
99
ALL_config='/etc/mkinitcpio.conf'
1010

11-
archiso_image="/boot/initramfs-linux.img"
11+
archiso_image="/boot/initramfs-linux-t2.img"

‎airootfs/etc/motd

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
This ISO is based on Arch-ISO modified hugely to provide Installation Environment for EndeavourOS.
2+
https://t2linux.org
23
https://endeavouros.com
34

5+
EndeavourOS-archiso-t2 Sources:
6+
https://github.com/endeavouros-team/EndeavourOS-ISO-t2
7+
48
EndeavourOS-archiso Sources:
59
https://github.com/endeavouros-team/EndeavourOS-ISO
610

@@ -12,18 +16,21 @@ https://github.com/calamares/calamares
1216

1317
Live environment will start now and let you install EndeavourOS to disk, or tryout KDE-Desktop from Live-Session.
1418

19+
!! WARNING : DO NOT REPORT ISSUES OR REQUEST HELP AT ENDEAVOUROS TEAM. YOU MUST COME TO T2LINUX DISCORD FOR HELP !!
20+
1521
Bugs can be reported here:
16-
https://forum.endeavouros.com/c/Arch-based-related-questions/bug-reports
22+
https://discord.com/invite/68MRhQu
1723

18-
Getting help at the forum: https://forum.endeavouros.com
19-
Help-Chat is available on telegram: https://t.me/Endeavouros/
20-
News at twitter: https://twitter.com/OsEndeavour
24+
Getting help at Discord: https://discord.com/invite/68MRhQu
25+
Upstream news at Twitter: https://twitter.com/OsEndeavour
2126

2227
Our journey wouldn't be made possible without the generosity of our open collective community:
23-
https://opencollective.com/endeavouros
28+
https://github.com/sponsors/NoaHimeska1873
29+
https://toss.me/yuruverse (South Korea residents only)
30+
https://opencollective.com/endeavouros (Upstream)
2431

2532
Thank you for donating your trust in us!
2633

27-
Welcome to your endeavour
34+
Welcome to you and your Mac's endeavour
2835

2936
------------------

‎airootfs/etc/pacman.conf

+7
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,13 @@ Include = /etc/pacman.d/mirrorlist
9595
[multilib]
9696
Include = /etc/pacman.d/mirrorlist
9797

98+
# T2Linux repositories
99+
# DO NOT REMOVE
100+
101+
[arch-mact2]
102+
SigLevel = Never
103+
Server = https://mirror.funami.tech/$repo/os/$arch
104+
98105
# An example of a custom package repository. See the pacman manpage for
99106
# tips on creating your own repositories.
100107
#[custom]

‎airootfs/etc/systemd/system/multi-user.target.wants/t2fand.service

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/usr/lib/systemd/system/t2fand.service

‎airootfs/etc/systemd/system/multi-user.target.wants/touchbard.service

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/usr/lib/systemd/system/touchbard.service

‎airootfs/etc/udev/rules.d/99-removables.rules

Whitespace-only changes.

‎efiboot/loader/entries/archiso-x86_64-linux-nv.conf

-7
This file was deleted.

‎efiboot/loader/entries/archiso-x86_64-linux.conf

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
title EndeavourOS x86_64 UEFI Default
22
sort-key A
3-
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
3+
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-t2
44
initrd /%INSTALL_DIR%/boot/intel-ucode.img
5-
initrd /%INSTALL_DIR%/boot/amd-ucode.img
6-
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
7-
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes
5+
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-t2.img
6+
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm,pcspkr nouveau.modeset=1 i915.modeset=1 radeon.modeset=1 nvme_load=yes intel_iommu=on iommu=pt pcie_ports=compat

‎efiboot/loader/entries/fallback.conf

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
title EndeavourOS x86_64 Fallback (nomodeset)
22
sort-key C
3-
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
4-
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
5-
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes
3+
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-t2
4+
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-t2.img
5+
options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% cow_spacesize=10G copytoram=n module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset nvme_load=yes intel_iommu=on iommu=pt pcie_ports=compat

‎packages.x86_64

+6-5
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## Base system
44
iptables-nft
5+
apple-bcm-firmware
6+
apple-t2-audio-config
57
base
68
base-devel
79
archlinux-keyring
@@ -14,10 +16,9 @@ dracut
1416
edk2-shell
1517
inetutils
1618
less
17-
linux
19+
linux-t2
1820
linux-firmware
19-
linux-firmware-marvell
20-
linux-headers
21+
linux-t2-headers
2122
logrotate
2223
lsb-release
2324
man-db
@@ -30,7 +31,9 @@ s-nail
3031
sudo
3132
sysfsutils
3233
systemd-sysvcompat
34+
t2fand
3335
texinfo
36+
touchbard
3437
which
3538
vi
3639

@@ -75,8 +78,6 @@ xorg-xkill
7578
xorg-xrandr
7679

7780
## Network hardware
78-
b43-fwcutter
79-
broadcom-wl-dkms
8081

8182
## General hardware
8283
lsscsi

‎profiledef.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/usr/bin/env bash
22
# shellcheck disable=SC2034
33

4-
iso_name="EndeavourOS"
5-
iso_label="EOS_$(date +%Y%m)"
6-
iso_publisher="EndeavourOS <https://endeavouros.com>"
7-
iso_application="EndeavourOS Live/Rescue CD"
8-
iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)"
4+
iso_name="EndeavourOS-T2"
5+
iso_label="EOS_T2_GALILEO"
6+
iso_publisher="t2linux <https://t2linux.org>"
7+
iso_application="EndeavourOS Live/Rescue CD for Macs with T2 security chip"
8+
iso_version="Galileo-T2"
99
install_dir="arch"
1010
buildmodes=('iso')
1111
quiet="n"

0 commit comments

Comments
 (0)