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

feat: Rebase onto Fedora 40

Browse Source
This commit is contained in:
Kyle Gospodnetich 2024-04-04 09:35:58 -07:00
parent fa37f652c4
commit 2c81c8db99
2 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,9 +51,9 @@ jobs:
base_image_flavor: [main, asus, framework, surface]
base_name: [bazzite, bazzite-deck, bazzite-nvidia]
base_image_name: [kinoite, silverblue]
major_version: [39]
major_version: [40]
include:
- major_version: 39
- major_version: 40
is_latest_version: true
is_stable_version: true
exclude:

72
Containerfile
View File

@ -5,7 +5,7 @@ ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-main}"
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}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bazzite
@ -15,7 +15,7 @@ ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-fsync}"
ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}"
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
COPY system_files/desktop/shared system_files/desktop/${BASE_IMAGE_NAME} /
@ -42,19 +42,19 @@ RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/repo/fedora-"
sed -i 's@gpgcheck=1@gpgcheck=0@g' /etc/yum.repos.d/tailscale.repo
# Install kernel-fsync
RUN wget https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/repo/fedora-$(rpm -E %fedora)/sentry-kernel-fsync-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_sentry-kernel-fsync.repo && \
rpm-ostree cliwrap install-to-root / && \
rpm-ostree override replace \
--experimental \
--from repo=copr:copr.fedorainfracloud.org:sentry:kernel-fsync \
kernel \
kernel-core \
kernel-modules \
kernel-modules-core \
kernel-modules-extra \
kernel-uki-virt \
kernel-headers \
kernel-devel
# RUN wget https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/repo/fedora-$(rpm -E %fedora)/sentry-kernel-fsync-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_sentry-kernel-fsync.repo && \
# rpm-ostree cliwrap install-to-root / && \
# rpm-ostree override replace \
# --experimental \
# --from repo=copr:copr.fedorainfracloud.org:sentry:kernel-fsync \
# kernel \
# kernel-core \
# kernel-modules \
# kernel-modules-core \
# kernel-modules-extra \
# kernel-uki-virt \
# kernel-headers \
# kernel-devel
# Setup firmware and asusctl for ASUS devices
RUN if [[ "${IMAGE_FLAVOR}" =~ "asus" ]]; then \
@ -81,25 +81,25 @@ RUN if [[ "${IMAGE_FLAVOR}" =~ "surface" ]]; then \
# Add ublue packages, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion
COPY --from=ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms
RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \
wget https://negativo17.org/repos/fedora-multimedia.repo -O /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \
rpm-ostree install \
/tmp/akmods-rpms/kmods/*xone*.rpm \
/tmp/akmods-rpms/kmods/*openrazer*.rpm \
/tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \
/tmp/akmods-rpms/kmods/*wl*.rpm \
/tmp/akmods-rpms/kmods/*gcadapter_oc*.rpm \
/tmp/akmods-rpms/kmods/*nct6687*.rpm \
/tmp/akmods-rpms/kmods/*evdi*.rpm \
/tmp/akmods-rpms/kmods/*zenergy*.rpm \
/tmp/akmods-rpms/kmods/*ayaneo-platform*.rpm \
/tmp/akmods-rpms/kmods/*ayn-platform*.rpm \
/tmp/akmods-rpms/kmods/*bmi160*.rpm \
/tmp/akmods-rpms/kmods/*bmi260*.rpm \
/tmp/akmods-rpms/kmods/*bmi323*.rpm \
/tmp/akmods-rpms/kmods/*rtl8814au*.rpm \
/tmp/akmods-rpms/kmods/*ryzen-smu*.rpm && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo
#RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \
# wget https://negativo17.org/repos/fedora-multimedia.repo -O /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \
# rpm-ostree install \
# /tmp/akmods-rpms/kmods/*xone*.rpm \
# /tmp/akmods-rpms/kmods/*openrazer*.rpm \
# /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \
# /tmp/akmods-rpms/kmods/*wl*.rpm \
# /tmp/akmods-rpms/kmods/*gcadapter_oc*.rpm \
# /tmp/akmods-rpms/kmods/*nct6687*.rpm \
# /tmp/akmods-rpms/kmods/*evdi*.rpm \
# /tmp/akmods-rpms/kmods/*zenergy*.rpm \
# /tmp/akmods-rpms/kmods/*ayaneo-platform*.rpm \
# /tmp/akmods-rpms/kmods/*ayn-platform*.rpm \
# /tmp/akmods-rpms/kmods/*bmi160*.rpm \
# /tmp/akmods-rpms/kmods/*bmi260*.rpm \
# /tmp/akmods-rpms/kmods/*bmi323*.rpm \
# /tmp/akmods-rpms/kmods/*rtl8814au*.rpm \
# /tmp/akmods-rpms/kmods/*ryzen-smu*.rpm && \
# sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo
# Update packages that commonly cause build issues
RUN rpm-ostree override replace \
@ -616,7 +616,7 @@ ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}"
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}"
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
COPY system_files/deck/shared system_files/deck/${BASE_IMAGE_NAME} /
@ -794,7 +794,7 @@ ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-nvidia}"
ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-fsync}"
ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}"
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
ARG NVIDIA_MAJOR_VERSION="550"
# Fetch NVIDIA driver