Skip to content

Commit

Permalink
Galileo-T2
Browse files Browse the repository at this point in the history
  • Loading branch information
NoaHimesaka1873 committed Oct 23, 2023
1 parent a96d86b commit f3ec273
Show file tree
Hide file tree
Showing 15 changed files with 127 additions and 51 deletions.
84 changes: 84 additions & 0 deletions .github/workflows/BuildISO.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
name: Build EndeavourOS ISO
on: [push, pull_request, workflow_dispatch]
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
if: ${{ !contains(github.event.head_commit.message, '[no build]') }}
uses: actions/checkout@v2
- name: Build In Docker
if: ${{ !contains(github.event.head_commit.message, '[no build]') }}
run: |
cat << \EOF > entrypoint.sh
pacman -Syu base base-devel reflector --needed --noconfirm
reflector --verbose --country $(curl https://ipv4.myip.wtf/text/country) --protocol http,https --latest 10 --sort rate --save /etc/pacman.d/mirrorlist
pacman-key --init
pacman -Syu wget --needed --noconfirm
pacman -Syu archlinux-keyring --noconfirm
cd /etc/pacman.d/
touch endeavouros-mirrorlist
echo "Server = https://mirror.funami.tech/endeavouros/repo/\$repo/\$arch" > endeavouros-mirrorlist
echo "Server = https://mirror.jingk.ai/endeavouros/repo/\$repo/\$arch" >> endeavouros-mirrorlist
cat endeavouros-mirrorlist
cd ..
printf "\n" >> pacman.conf
echo "[endeavouros]" >> pacman.conf
echo "SigLevel = Never" >> pacman.conf
echo "Include = /etc/pacman.d/endeavouros-mirrorlist" >> pacman.conf
printf "\n" >> pacman.conf
cat pacman.conf
wget https://raw.githubusercontent.com/endeavouros-team/keyring/main/endeavouros.gpg -O endeavouros.gpg
wget https://mirror.funami.tech/endeavouros/repo/endeavouros/x86_64/endeavouros-keyring-20230523-1-any.pkg.tar.zst
pacman -U endeavouros-keyring-20230523-1-any.pkg.tar.zst --noconfirm --needed
pacman-key --add endeavouros.gpg && sudo pacman-key --lsign-key 497AF50C92AD2384C56E1ACA003DB8B0CB23504F
pacman-key --populate
pacman-key --recv-keys 8BE1FEE14302371DEF6F910A0E5877AC225D1980 --keyserver hkps://keyserver.ubuntu.com
pacman-key --lsign-key 8BE1FEE14302371DEF6F910A0E5877AC225D1980
pacman-key --populate
pacman -Syu
pacman-key --populate
pacman-key --populate archlinux
cd /build
useradd builduser -m
passwd -d builduser
pacman -Syu --noconfirm --needed sudo git base-devel
pacman -S archiso mkinitcpio-archiso git squashfs-tools --needed --noconfirm
printf "builduser ALL=NOPASSWD: ALL\n" | tee -a /etc/sudoers
chown -R builduser:builduser ./
sudo -u builduser bash ./prepare.sh
./mkarchiso "."
EOF
docker run --privileged -t -v $PWD:/build archlinux /bin/bash /build/entrypoint.sh
- name: Upload Built ISO
if: ${{ github.ref == 'refs/heads/galileo' && !contains(github.event.head_commit.message, '[no rel]') && !contains(github.event.head_commit.message, '[no build]') }}
uses: actions/upload-artifact@v2
with:
name: built-iso
path: ${{ github.workspace }}/out/*.iso
- name: Create Tag
id: create_tag
if: ${{ github.ref == 'refs/heads/galileo' && !contains(github.event.head_commit.message, '[no rel]') && !contains(github.event.head_commit.message, '[no build]') }}
run: |
export TAG=$(date +%Y.%m.%d)
echo "::set-output name=tag::${TAG}"
echo $TAG
- name: Release
if: ${{ github.ref == 'refs/heads/galileo' && !contains(github.event.head_commit.message, '[no rel]') && !contains(github.event.head_commit.message, '[no build]') }}
uses: softprops/action-gh-release@v1
with:
files: |
${{ github.workspace }}/out/*.iso
tag_name: ${{ steps.create_tag.outputs.tag }}
name: ${{ steps.create_tag.outputs.tag }}
draft: ${{ contains(github.event.head_commit.message, '[draft]') }}
prerelease: ${{ contains(github.event.head_commit.message, '[prerel]') }}
body: |
Follow [this guide](https://wiki.t2linux.org/distributions/endeavouros/installation/) using this ISO to install EndeavourOS on your T2 Mac
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17 changes: 0 additions & 17 deletions .github/workflows/gitlab.yml

This file was deleted.

2 changes: 1 addition & 1 deletion airootfs/etc/hostname
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
EndeavourOS
EndeavourOS-T2
2 changes: 1 addition & 1 deletion airootfs/etc/mkinitcpio.conf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# run. Advanced users may wish to specify all system modules
# in this array. For instance:
# MODULES=(piix ide_disk reiserfs)
MODULES=(vmd)
MODULES=(vmd apple-bce)

# BINARIES
# This setting includes any additional binaries a given user may
Expand Down
4 changes: 2 additions & 2 deletions airootfs/etc/mkinitcpio.d/linux.preset
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

PRESETS=('archiso')

ALL_kver='/boot/vmlinuz-linux'
ALL_kver='/boot/vmlinuz-linux-t2'
ALL_config='/etc/mkinitcpio.conf'

archiso_image="/boot/initramfs-linux.img"
archiso_image="/boot/initramfs-linux-t2.img"
19 changes: 13 additions & 6 deletions airootfs/etc/motd
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
This ISO is based on Arch-ISO modified hugely to provide Installation Environment for EndeavourOS.
https://t2linux.org
https://endeavouros.com

EndeavourOS-archiso-t2 Sources:
https://github.com/endeavouros-team/EndeavourOS-ISO-t2

EndeavourOS-archiso Sources:
https://github.com/endeavouros-team/EndeavourOS-ISO

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

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

!! WARNING : DO NOT REPORT ISSUES OR REQUEST HELP AT ENDEAVOUROS TEAM. YOU MUST COME TO T2LINUX DISCORD FOR HELP !!

Bugs can be reported here:
https://forum.endeavouros.com/c/Arch-based-related-questions/bug-reports
https://discord.com/invite/68MRhQu

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

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

Thank you for donating your trust in us!

Welcome to your endeavour
Welcome to you and your Mac's endeavour

------------------
7 changes: 7 additions & 0 deletions airootfs/etc/pacman.conf
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,13 @@ Include = /etc/pacman.d/mirrorlist
[multilib]
Include = /etc/pacman.d/mirrorlist

# T2Linux repositories
# DO NOT REMOVE

[arch-mact2]
SigLevel = Never
Server = https://mirror.funami.tech/$repo/os/$arch

# An example of a custom package repository. See the pacman manpage for
# tips on creating your own repositories.
#[custom]
Expand Down
Empty file.
7 changes: 0 additions & 7 deletions efiboot/loader/entries/archiso-x86_64-linux-nv.conf

This file was deleted.

7 changes: 3 additions & 4 deletions efiboot/loader/entries/archiso-x86_64-linux.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
title EndeavourOS x86_64 UEFI Default
sort-key A
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-t2
initrd /%INSTALL_DIR%/boot/intel-ucode.img
initrd /%INSTALL_DIR%/boot/amd-ucode.img
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
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
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-t2.img
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
6 changes: 3 additions & 3 deletions efiboot/loader/entries/fallback.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
title EndeavourOS x86_64 Fallback (nomodeset)
sort-key C
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
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
linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-t2
initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux-t2.img
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
11 changes: 6 additions & 5 deletions packages.x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Base system
iptables-nft
apple-bcm-firmware
apple-t2-audio-config
base
base-devel
archlinux-keyring
Expand All @@ -14,10 +16,9 @@ dracut
edk2-shell
inetutils
less
linux
linux-t2
linux-firmware
linux-firmware-marvell
linux-headers
linux-t2-headers
logrotate
lsb-release
man-db
Expand All @@ -30,7 +31,9 @@ s-nail
sudo
sysfsutils
systemd-sysvcompat
t2fand
texinfo
touchbard
which
vi

Expand Down Expand Up @@ -75,8 +78,6 @@ xorg-xkill
xorg-xrandr

## Network hardware
b43-fwcutter
broadcom-wl-dkms

## General hardware
lsscsi
Expand Down
10 changes: 5 additions & 5 deletions profiledef.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
# shellcheck disable=SC2034

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

0 comments on commit f3ec273

Please sign in to comment.