Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

arm64/installcd: Enable Apple Silicion & dist-kernel support #25

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
2 changes: 2 additions & 0 deletions releases/portage/isos/package.use/asahi
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Prevent asahi-meta build unneeded parts for the installcd
sys-apps/asahi-meta -audio -mesa
2 changes: 2 additions & 0 deletions releases/portage/isos/package.use/rust
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Needed for Asahi support on arm64
dev-lang/rust-bin rustfmt rust-src
32 changes: 20 additions & 12 deletions releases/specs/arm64/installcd-stage1.spec
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,26 @@ livecd/use:

livecd/packages:
app-accessibility/brltty
#app-accessibility/espeakup # needs keywording
app-accessibility/espeakup
app-admin/hddtemp
app-admin/pwgen
app-admin/syslog-ng
app-arch/unzip
app-crypt/gnupg
#app-editors/mg # needs keywording
app-editors/mg
app-editors/nano
app-misc/livecd-tools
app-misc/screen
app-misc/tmux
app-portage/cpuid2cpuflags
app-portage/gentoolkit
app-portage/mirrorselect
app-shells/bash-completion
app-shells/gentoo-bashcomp
app-text/wgetpaste
dev-embedded/u-boot-tools
dev-lang/rust-bin
dev-util/bindgen
media-gfx/fbgrab
media-sound/alsa-utils
net-analyzer/traceroute
Expand All @@ -53,34 +56,34 @@ livecd/packages:
net-misc/openssh
net-misc/rdate
net-misc/rsync
#net-misc/vconfig # needs stable
net-misc/vconfig
net-proxy/dante
#net-proxy/tsocks # needs stable
net-proxy/tsocks
net-wireless/b43-fwcutter
net-wireless/iw
net-wireless/wireless-tools
net-wireless/wpa_supplicant
sys-apps/busybox
sys-apps/dmidecode
sys-apps/ethtool
#sys-apps/fxload # needs keywording
sys-apps/fxload
sys-apps/gptfdisk
sys-apps/hdparm
sys-apps/iproute2
#sys-apps/memtester # needs keywording
sys-apps/memtester
sys-apps/merge-usr
#sys-apps/netplug # needs keywording
sys-apps/netplug
sys-apps/nvme-cli
sys-apps/pciutils
sys-apps/pv
#sys-apps/pcmciautils # needs keywording
#sys-apps/sdparm # needs keywording
sys-apps/pcmciautils
sys-apps/sdparm
sys-apps/usbutils
sys-auth/ssh-import-id
sys-block/parted
#sys-block/partimage # needs keywording
#sys-firmware/ipw2100-firmware # needs keywording
#sys-firmware/ipw2200-firmware # needs keywording
sys-block/partimage
sys-firmware/ipw2100-firmware
sys-firmware/ipw2200-firmware
sys-fs/bcache-tools
sys-fs/btrfs-progs
sys-fs/cryptsetup
Expand All @@ -102,3 +105,8 @@ livecd/packages:
sys-libs/gpm
sys-power/acpid
www-client/links
virtual/rust
# Asahi packages for Apple Silcion support
sys-apps/asahi-configs
sys-apps/asahi-scripts
sys-firmware/asahi-firmware
20 changes: 17 additions & 3 deletions releases/specs/arm64/installcd-stage2-minimal.spec
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,21 @@ livecd/iso: install-arm64-minimal-@[email protected]
livecd/type: gentoo-release-minimal
livecd/volid: Gentoo arm64 @TIMESTAMP@

boot/kernel: gentoo
boot/kernel: asahi gentoo fallback

boot/kernel/gentoo/sources: sys-kernel/gentoo-sources
boot/kernel/gentoo/config: @REPO_DIR@/releases/kconfig/arm64/arm64-5.15.12.config
boot/kernel/asahi/distkernel: yes
boot/kernel/asahi/sources: sys-kernel/asahi-kernel
boot/kernel/asahi/dracut_args: --xz --no-hostonly -a dmsquash-live -o btrfs -o i18n -o usrmount -o lunmask -o multipath -i /lib/keymaps /lib/keymaps -I busybox
boot/kernel/asahi/packages: --usepkg n zfs zfs-kmod

boot/kernel/gentoo/distkernel: yes
boot/kernel/gentoo/dracut_args: --xz --no-hostonly -a dmsquash-live -a mdraid -o btrfs -o crypt -o i18n -o usrmount -o lunmask -o qemu -o qemu-net -o nvdimm -o multipath -o zfs -i /lib/keymaps /lib/keymaps -I busybox
boot/kernel/gentoo/packages: --usepkg n zfs zfs-kmod

boot/kernel/fallback/sources: sys-kernel/gentoo-sources
boot/kernel/fallback/config: @REPO_DIR@/releases/kconfig/arm64/arm64-5.15.12.config
boot/kernel/fallback/packages: --usepkg n zfs zfs-kmod

livecd/unmerge:
app-admin/eselect
app-admin/eselect-ctags
Expand All @@ -28,10 +37,12 @@ livecd/unmerge:
app-admin/python-updater
app-arch/cpio
dev-build/libtool
dev-lang/rust-bin
dev-libs/gmp
dev-libs/libxml2
dev-libs/mpfr
dev-python/pycrypto
dev-util/bindgen
dev-util/pkgconfig
dev-util/pkgconf
perl-core/PodParser
Expand All @@ -51,18 +62,21 @@ livecd/unmerge:
sys-devel/binutils
sys-devel/binutils-config
sys-devel/bison
sys-devel/clang
sys-devel/flex
sys-devel/gcc
sys-devel/gcc-config
sys-devel/gettext
sys-devel/gnuconfig
sys-devel/llvm
sys-devel/m4
sys-devel/make
sys-devel/patch
sys-libs/db
sys-libs/gdbm
sys-kernel/genkernel
sys-kernel/linux-headers
virtual/rust

livecd/empty:
/boot
Expand Down