mirror/bazzite
1
0
Fork 0
mirror of https://github.com/ublue-os/bazzite.git synced 2025-02-06 00:39:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'testing'

Browse Source
This commit is contained in:
Kyle Gospodnetich 2024-09-21 22:55:45 -07:00
commit ba7e5ef94d
3 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -68,7 +68,7 @@ jobs:
is_latest_version: true
is_stable_version: true
kernel_flavor: fsync-ba # must match a kernel_flavor from akmods repo
kernel_version: 6.9.12-205.fsync.fc40.x86_64 # must match a cached version of the above flavor
kernel_version: 6.9.12-206.fsync.fc40.x86_64 # must match a cached version of the above flavor
exclude:
- base_name: bazzite
target_nvidia_flavor: nvidia

40
Containerfile
View File

@ -2,8 +2,8 @@ ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}"
ARG BASE_IMAGE_FLAVOR="${BASE_IMAGE_FLAVOR:-main}"
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
ARG NVIDIA_FLAVOR=${NVIDIA_FLAVOR:-nvidia}""
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync}"
ARG KERNEL_VERSION="${KERNEL_VERSION:-6.10.4-201.fsync.fc40.x86_64}"
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync-ba}"
ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-206.fsync.fc40.x86_64}"
ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}"
ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$BASE_IMAGE_FLAVOR}"
ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}"
@ -23,8 +23,8 @@ ARG IMAGE_NAME="${IMAGE_NAME:-bazzite}"
ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}"
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
ARG NVIDIA_FLAVOR=${NVIDIA_FLAVOR:-nvidia}""
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync}"
ARG KERNEL_VERSION="${KERNEL_VERSION:-6.10.4-201.fsync.fc40.x86_64}"
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync-ba}"
ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-206.fsync.fc40.x86_64}"
ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}"
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
@ -65,8 +65,10 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
rpm-ostree override replace \
--experimental \
--from repo=updates \
nss \
nss-softokn \
nss-softokn-freebl \
nss-sysinit \
nss-util \
|| true && \
rpm-ostree override replace \
@ -238,7 +240,29 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
ostree container commit
# Setup firmware
# Downgrade firmware to address galileo waking while asleep
RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
rpm-ostree override replace \
--experimental \
--from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite \
amd-gpu-firmware \
amd-ucode-firmware \
atheros-firmware \
brcmfmac-firmware \
cirrus-audio-firmware \
intel-audio-firmware \
intel-gpu-firmware \
iwlegacy-firmware \
iwlwifi-dvm-firmware \
iwlwifi-mvm-firmware \
libertas-firmware \
linux-firmware \
linux-firmware-whence \
mt7xxx-firmware \
nvidia-gpu-firmware \
nxpwireless-firmware \
realtek-firmware \
tiwilink-firmware && \
mkdir -p /tmp/linux-firmware-neptune && \
curl -Lo /tmp/linux-firmware-neptune/cs35l41-dsp1-spk-cali.bin https://gitlab.com/evlaV/linux-firmware-neptune/-/raw/"${JUPITER_FIRMWARE_VERSION}"/cs35l41-dsp1-spk-cali.bin && \
curl -Lo /tmp/linux-firmware-neptune/cs35l41-dsp1-spk-cali.wmfw https://gitlab.com/evlaV/linux-firmware-neptune/-/raw/"${JUPITER_FIRMWARE_VERSION}"/cs35l41-dsp1-spk-cali.wmfw && \
@ -744,8 +768,8 @@ ARG IMAGE_NAME="${IMAGE_NAME:-bazzite-deck}"
ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}"
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
ARG NVIDIA_FLAVOR=${NVIDIA_FLAVOR:-nvidia}""
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync}"
ARG KERNEL_VERSION="${KERNEL_VERSION:-6.10.4-201.fsync.fc40.x86_64}"
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync-ba}"
ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-206.fsync.fc40.x86_64}"
ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}"
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
@ -898,8 +922,8 @@ ARG IMAGE_NAME="${IMAGE_NAME:-bazzite-nvidia}"
ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}"
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-nvidia}"
ARG NVIDIA_FLAVOR=${NVIDIA_FLAVOR:-nvidia}""
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync}"
ARG KERNEL_VERSION="${KERNEL_VERSION:-6.10.4-201.fsync.fc40.x86_64}"
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync-ba}"
ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-206.fsync.fc40.x86_64}"
ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}"
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"

2
just_scripts/build-image.sh
View File

@ -37,7 +37,7 @@ $container_mgr build -f Containerfile \
--build-arg="BASE_IMAGE_NAME=${base_image}" \
--build-arg="BASE_IMAGE_FLAVOR=${flavor}" \
--build-arg="IMAGE_FLAVOR=${flavor}" \
--build-arg="KERNEL_FLAVOR=fsync" \
--build-arg="KERNEL_FLAVOR=fsync-ba" \
--build-arg="SOURCE_IMAGE=${base_image}-${flavor}" \
--build-arg="FEDORA_MAJOR_VERSION=${latest}" \
--target="${target}" \