diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 21287c1f..aea5c18f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,6 @@ on: workflow_dispatch: env: IMAGE_REGISTRY: ghcr.io/${{ github.repository_owner }} - KERNEL_VERSION: 6.8.4-202.fsync concurrency: group: ${{ github.workflow }}-${{ github.ref || github.run_id }} @@ -86,7 +85,7 @@ jobs: - name: Matrix Variables run: | - echo "AKMODS_FLAVOR=fsync" >> $GITHUB_ENV + echo "AKMODS_FLAVOR=fsync-lts" >> $GITHUB_ENV echo "BASE_IMAGE_NAME=${{ matrix.base_image_name }}" >> $GITHUB_ENV if [[ "${{ matrix.base_image_flavor }}" == "framework" ]]; then diff --git a/Containerfile b/Containerfile index c781bc43..2a9391a0 100644 --- a/Containerfile +++ b/Containerfile @@ -12,7 +12,7 @@ FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bazzite ARG IMAGE_NAME="${IMAGE_NAME:-bazzite}" ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}" -ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-fsync}" +ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-fsync-lts}" ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}" ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" @@ -45,11 +45,11 @@ RUN wget https://raw.githubusercontent.com/ublue-os/COPR-command/main/copr -O /u ostree container commit # 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 && \ +RUN wget https://copr.fedorainfracloud.org/coprs/sentry/kernel-ba/repo/fedora-$(rpm -E %fedora)/sentry-kernel-ba-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_sentry-kernel-ba.repo && \ rpm-ostree cliwrap install-to-root / && \ rpm-ostree override replace \ --experimental \ - --from repo=copr:copr.fedorainfracloud.org:sentry:kernel-fsync \ + --from repo=copr:copr.fedorainfracloud.org:sentry:kernel-ba \ kernel \ kernel-core \ kernel-modules \ @@ -801,7 +801,7 @@ FROM bazzite as bazzite-nvidia ARG IMAGE_NAME="${IMAGE_NAME:-bazzite-nvidia}" ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-nvidia}" -ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-fsync}" +ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-fsync-lts}" ARG IMAGE_BRANCH="${IMAGE_BRANCH:-main}" ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}" ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}"