From 7af19207523700920e6eaecfa1c5979acf3ddbc9 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sat, 21 Sep 2024 14:05:23 -0700 Subject: [PATCH 1/7] chore: Try kernel-ba 6.9.12-206 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dbdc7f6f..8c342689 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 From 2b09884e2799c65f54778c91b2656a863ad4d161 Mon Sep 17 00:00:00 2001 From: RJ Sampson Date: Sat, 21 Sep 2024 19:40:16 -0600 Subject: [PATCH 2/7] fix: Use nss and nss-sysinit from updates Signed-off-by: RJ Sampson --- Containerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Containerfile b/Containerfile index 559a7cd2..6f07ae35 100644 --- a/Containerfile +++ b/Containerfile @@ -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 \ From a1237200c556aa4c25700dfcb27adc52261f78f3 Mon Sep 17 00:00:00 2001 From: RJ Sampson Date: Sat, 21 Sep 2024 19:44:23 -0600 Subject: [PATCH 3/7] chore(Containerfile): Use current kernel version Local builds were failing Signed-off-by: RJ Sampson --- Containerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Containerfile b/Containerfile index 6f07ae35..60f185d9 100644 --- a/Containerfile +++ b/Containerfile @@ -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}" From 4c55b479cb56a0c61cfc9aef047be14563f548e9 Mon Sep 17 00:00:00 2001 From: RJ Sampson Date: Sat, 21 Sep 2024 21:29:25 -0600 Subject: [PATCH 4/7] chore(Containerfile): Use current kernel when building Deck images locally too Signed-off-by: RJ Sampson --- Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index 60f185d9..44eec480 100644 --- a/Containerfile +++ b/Containerfile @@ -746,8 +746,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}" From 0ea9ac1ac63c5517c3e7d3f7ecdab458b936f652 Mon Sep 17 00:00:00 2001 From: RJ Sampson Date: Sat, 21 Sep 2024 21:32:43 -0600 Subject: [PATCH 5/7] chore(Containerfile): And NVIDIA ... Signed-off-by: RJ Sampson --- Containerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index 44eec480..84139368 100644 --- a/Containerfile +++ b/Containerfile @@ -900,8 +900,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}" From 771f1fcfa87d504c00296d177e5b2f5b50b8493d Mon Sep 17 00:00:00 2001 From: RJ Sampson Date: Sat, 21 Sep 2024 22:14:21 -0600 Subject: [PATCH 6/7] fix: Try downgrading linux firmware to fix SD OLED sleep/resume issue Signed-off-by: RJ Sampson --- Containerfile | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Containerfile b/Containerfile index 84139368..c10caced 100644 --- a/Containerfile +++ b/Containerfile @@ -240,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 && \ From 3e395131b497a466e7acc70e4f2e6f311424765b Mon Sep 17 00:00:00 2001 From: RJ Sampson Date: Sat, 21 Sep 2024 22:18:40 -0600 Subject: [PATCH 7/7] fix(build-image): Default to fsync-ba Signed-off-by: RJ Sampson --- just_scripts/build-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/just_scripts/build-image.sh b/just_scripts/build-image.sh index 1974a47a..2ee531de 100755 --- a/just_scripts/build-image.sh +++ b/just_scripts/build-image.sh @@ -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}" \