mirror/bazzite
1
0
Fork 0
mirror of https://github.com/ublue-os/bazzite.git synced 2025-03-01 07:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Update kernel to 6.11.4-301

Browse Source
This commit is contained in:
Kyle Gospodnetich 2024-10-18 23:55:13 -07:00
parent b452236e18
commit 5f92dd5630
2 changed files with 17 additions and 21 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_latest_version: true
is_stable_version: true is_stable_version: true
kernel_flavor: bazzite # must match a kernel_flavor from akmods repo kernel_flavor: bazzite # must match a kernel_flavor from akmods repo
kernel_version: 6.11.2-201.bazzite.fc41.x86_64 # must match a cached version of the above flavor kernel_version: 6.11.4-301.bazzite.fc41.x86_64 # must match a cached version of the above flavor
exclude: exclude:
- base_name: bazzite - base_name: bazzite
target_nvidia_flavor: nvidia target_nvidia_flavor: nvidia

30
Containerfile
View File

@ -2,7 +2,7 @@ ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}"
ARG BASE_IMAGE_FLAVOR="${BASE_IMAGE_FLAVOR:-main}" ARG BASE_IMAGE_FLAVOR="${BASE_IMAGE_FLAVOR:-main}"
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
ARG NVIDIA_FLAVOR="${NVIDIA_FLAVOR:-nvidia}" ARG NVIDIA_FLAVOR="${NVIDIA_FLAVOR:-nvidia}"
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync-ba}" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-bazzite}"
ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-8.fsync.fc40.x86_64}" ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-8.fsync.fc40.x86_64}"
ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}" ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}"
ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$BASE_IMAGE_FLAVOR}" ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$BASE_IMAGE_FLAVOR}"
@ -13,7 +13,7 @@ ARG SHA_HEAD_SHORT="${SHA_HEAD_SHORT}"
ARG VERSION_TAG="${VERSION_TAG}" ARG VERSION_TAG="${VERSION_TAG}"
ARG VERSION_PRETTY="${VERSION_PRETTY}" ARG VERSION_PRETTY="${VERSION_PRETTY}"
FROM ghcr.io/ublue-os/${KERNEL_FLAVOR}-kernel:${FEDORA_MAJOR_VERSION}-${KERNEL_VERSION} AS fsync FROM ghcr.io/ublue-os/${KERNEL_FLAVOR}-kernel:${FEDORA_MAJOR_VERSION}-${KERNEL_VERSION} AS kernel
FROM ghcr.io/ublue-os/akmods:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION}-${KERNEL_VERSION} AS akmods FROM ghcr.io/ublue-os/akmods:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION}-${KERNEL_VERSION} AS akmods
FROM ghcr.io/ublue-os/akmods-extra:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION}-${KERNEL_VERSION} AS akmods-extra FROM ghcr.io/ublue-os/akmods-extra:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION}-${KERNEL_VERSION} AS akmods-extra
@ -23,8 +23,8 @@ ARG IMAGE_NAME="${IMAGE_NAME:-bazzite}"
ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}" ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}"
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
ARG NVIDIA_FLAVOR="${NVIDIA_FLAVOR:-nvidia}" ARG NVIDIA_FLAVOR="${NVIDIA_FLAVOR:-nvidia}"
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync-ba}" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-bazzite}"
ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-208.fsync.fc40.x86_64}" ARG KERNEL_VERSION="${KERNEL_VERSION:-6.11.4-301.bazzite.fc41.x86_64}"
ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}" ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}"
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}" ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-41}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-41}"
@ -225,21 +225,17 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
/usr/libexec/containerbuild/cleanup.sh && \ /usr/libexec/containerbuild/cleanup.sh && \
ostree container commit ostree container commit
# Install kernel-fsync # Install kernel
RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
--mount=type=bind,from=fsync,src=/tmp/rpms,dst=/tmp/fsync-rpms \ --mount=type=bind,from=kernel,src=/tmp/rpms,dst=/tmp/kernel-rpms \
rpm-ostree cliwrap install-to-root / && \ rpm-ostree cliwrap install-to-root / && \
if [[ "${KERNEL_FLAVOR}" =~ "fsync" ]]; then \
echo "Will install ${KERNEL_FLAVOR} kernel" && \ echo "Will install ${KERNEL_FLAVOR} kernel" && \
rpm-ostree override replace \ rpm-ostree override replace \
--experimental \ --experimental \
/tmp/fsync-rpms/kernel-[0-9]*.rpm \ /tmp/kernel-rpms/kernel-[0-9]*.rpm \
/tmp/fsync-rpms/kernel-core-*.rpm \ /tmp/kernel-rpms/kernel-core-*.rpm \
/tmp/fsync-rpms/kernel-modules-*.rpm \ /tmp/kernel-rpms/kernel-modules-*.rpm \
/tmp/fsync-rpms/kernel-uki-virt-*.rpm \ /tmp/kernel-rpms/kernel-uki-virt-*.rpm && \
; else \
echo "will use kernel from ${KERNEL_FLAVOR} images" \
; fi && \
rpm-ostree install \ rpm-ostree install \
scx-scheds && \ scx-scheds && \
/usr/libexec/containerbuild/cleanup.sh && \ /usr/libexec/containerbuild/cleanup.sh && \
@ -769,7 +765,7 @@ ARG IMAGE_NAME="${IMAGE_NAME:-bazzite-deck}"
ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}" ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}"
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
ARG NVIDIA_FLAVOR="${NVIDIA_FLAVOR:-nvidia}" ARG NVIDIA_FLAVOR="${NVIDIA_FLAVOR:-nvidia}"
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync-ba}" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-bazzite}"
ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-206.fsync.fc40.x86_64}" ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-206.fsync.fc40.x86_64}"
ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}" ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}"
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}" ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}"
@ -939,8 +935,8 @@ ARG IMAGE_NAME="${IMAGE_NAME:-bazzite-nvidia}"
ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}" ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}"
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-nvidia}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-nvidia}"
ARG NVIDIA_FLAVOR="${NVIDIA_FLAVOR:-nvidia}" ARG NVIDIA_FLAVOR="${NVIDIA_FLAVOR:-nvidia}"
ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync-ba}" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-bazzite}"
ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.12-208.fsync.fc40.x86_64}" ARG KERNEL_VERSION="${KERNEL_VERSION:-6.11.4-301.bazzite.fc41.x86_64}"
ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}" ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}"
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}" ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}"
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-41}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-41}"