Merge branch 'main' into aurorawallfix

.github/workflows/build-coreos-aurora.yml

@@ -8,7 +8,7 @@ on:
       - '**.md'
       - 'system_files/silverblue/**'
   schedule:
-    - cron: '41 5 * * *'  # 5:41 UTC everyday
+    - cron: '45 5 * * *'  # 5:41 UTC everyday
   workflow_dispatch:
 
 jobs:
@@ -20,5 +20,5 @@ jobs:
       brand_name: aurora
       fedora_version: stable
       rechunk: true
-      weekly_tag_day: Tuesday
+      weekly_tag_day: Sunday
 

.github/workflows/build-coreos-bluefin.yml

@@ -8,7 +8,7 @@ on:
       - '**.md'
       - 'system_files/kinoite/**'
   schedule:
-    - cron: '41 5 * * *'  # 5:41 UTC everyday
+    - cron: '45 5 * * *'  # 5:41 UTC everyday
   workflow_dispatch:
 
 jobs:
@@ -20,5 +20,5 @@ jobs:
       brand_name: bluefin
       fedora_version: stable
       rechunk: true
-      weekly_tag_day: Tuesday
+      weekly_tag_day: Sunday
 

.github/workflows/reusable-build.yml

@@ -172,6 +172,7 @@ jobs:
 
       - name: Verify ZFS
         uses: EyeCantCU/cosign-action/verify@58722a084c82190b57863002d494c91eabbe9e79 # v0.3.0
+        if: inputs.fedora_version != 'beta'
         with:
           containers: akmods-zfs:coreos-stable-${{ env.fedora_version }}
 
@@ -337,7 +338,6 @@ jobs:
             sudo podman pull ${{ env.IMAGE_REGISTRY }}/${{ env.BASE_IMAGE_NAME }}-${{ env.image_flavor }}:${{ env.fedora_version }}
             sudo podman pull ${{ env.IMAGE_REGISTRY }}/akmods:${{ env.AKMODS_FLAVOR }}-${{ env.fedora_version }}
             sudo podman pull ${{ env.IMAGE_REGISTRY }}/akmods-nvidia:${{ env.AKMODS_FLAVOR }}-${{ env.fedora_version }}
-            sudo podman pull ${{ env.IMAGE_REGISTRY }}/akmods-zfs:coreos-stable-${{ env.fedora_version }}
             sudo podman pull ${{ env.IMAGE_REGISTRY }}/${{ env.AKMODS_FLAVOR }}-kernel:${{ env.kernel_release }}
 
       - name: Build Image

Containerfile

@@ -6,17 +6,15 @@ ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
 ARG TARGET_BASE="${TARGET_BASE:-bluefin}"
 ARG NVIDIA_TYPE="${NVIDIA_TYPE:-}"
-ARG KERNEL="${KERNEL:-6.9.7-200.fc40.x86_64}"
+ARG KERNEL="${KERNEL:-6.10.10-200.fc40.x86_64}"
 ARG UBLUE_IMAGE_TAG="${UBLUE_IMAGE_TAG:-latest}"
 ARG SHA_HEAD_SHORT="${SHA_HEAD_SHORT}"
 
 # FROM's for Mounting
 ARG KMOD_SOURCE_COMMON="ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION}"
-ARG ZFS_CACHE="ghcr.io/ublue-os/akmods-zfs:coreos-stable-${FEDORA_MAJOR_VERSION}"
 ARG NVIDIA_CACHE="ghcr.io/ublue-os/akmods-nvidia:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION}"
 ARG KERNEL_CACHE="ghcr.io/ublue-os/${AKMODS_FLAVOR}-kernel:${KERNEL}"
 FROM ${KMOD_SOURCE_COMMON} AS akmods
-FROM ${ZFS_CACHE} AS zfs_cache
 FROM ${NVIDIA_CACHE} AS nvidia_cache
 FROM ${KERNEL_CACHE} AS kernel_cache
 
@@ -33,7 +31,7 @@ ARG AKMODS_FLAVOR="${AKMODS_FLAVOR}"
 ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
 ARG NVIDIA_TYPE="${NVIDIA_TYPE:-}"
-ARG KERNEL="${KERNEL:-6.9.7-200.fc40.x86_64}"
+ARG KERNEL="${KERNEL:-6.10.10-200.fc40.x86_64}"
 ARG UBLUE_IMAGE_TAG="${UBLUE_IMAGE_TAG:-latest}"
 ARG SHA_HEAD_SHORT="${SHA_HEAD_SHORT}"
 
@@ -43,7 +41,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \
     --mount=type=bind,from=akmods,source=/rpms,target=/tmp/akmods \
     --mount=type=bind,from=nvidia_cache,source=/rpms,target=/tmp/akmods-rpms \
     --mount=type=bind,from=kernel_cache,source=/tmp/rpms,target=/tmp/kernel-rpms \
-    --mount=type=bind,from=zfs_cache,source=/rpms,target=/tmp/akmods-zfs \
     rpm-ostree cliwrap install-to-root / && \
     mkdir -p /var/lib/alternatives && \
     /ctx/build_files/build-base.sh  && \
@@ -64,7 +61,7 @@ ARG IMAGE_FLAVOR="${IMAGE_FLAVOR}"
 ARG AKMODS_FLAVOR="${AKMODS_FLAVOR}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
 ARG NVIDIA_TYPE="${NVIDIA_TYPE:-}"
-ARG KERNEL="${KERNEL:-6.9.7-200.fc40.x86_64}"
+ARG KERNEL="${KERNEL:-6.10.10-200.fc40.x86_64}"
 ARG UBLUE_IMAGE_TAG="${UBLUE_IMAGE_TAG:-latest}"
 
 # Build, Clean-up, Commit

build_files/aurora-changes.sh

@@ -28,4 +28,4 @@ if [[ "${BASE_IMAGE_NAME}" = "kinoite" ]]; then
     glib-compile-schemas --strict /tmp/aurora-schema-test
     echo "Compiling gschema to include aurora setting overrides"
     glib-compile-schemas /usr/share/glib-2.0/schemas &>/dev/null    
-fi
+fi

build_files/install-akmods.sh

@@ -29,7 +29,21 @@ rpm-ostree uninstall rpmfusion-free-release rpmfusion-nonfree-release
 
 # ZFS for gts/stable
 if [[ ${AKMODS_FLAVOR} =~ "coreos" ]]; then
-    rpm-ostree install pv /tmp/akmods-zfs/kmods/zfs/*.rpm
+    skopeo copy docker://ghcr.io/ublue-os/akmods-zfs:coreos-stable-"$(rpm -E %fedora)"-"${KERNEL}" dir:/tmp/akmods-zfs
+    ZFS_TARGZ=$(jq -r '.layers[].digest' < /tmp/akmods-zfs/manifest.json | cut -d : -f 2)
+    tar -xvzf /tmp/akmods-zfs/"$ZFS_TARGZ" -C /tmp/
+    mv /tmp/rpms/* /tmp/akmods-zfs/
+    ZFS_RPMS=(
+        /tmp/akmods-zfs/kmods/zfs/kmod-zfs-"${KERNEL}"-*.rpm
+        /tmp/akmods-zfs/kmods/zfs/libnvpair3-*.rpm
+        /tmp/akmods-zfs/kmods/zfs/libuutil3-*.rpm
+        /tmp/akmods-zfs/kmods/zfs/libzfs5-*.rpm
+        /tmp/akmods-zfs/kmods/zfs/libzpool5-*.rpm
+        /tmp/akmods-zfs/kmods/zfs/python3-pyzfs-*.rpm
+        /tmp/akmods-zfs/kmods/zfs/zfs-*.rpm
+        pv
+    )
+    rpm-ostree install "${ZFS_RPMS[@]}"
     depmod -a -v "${KERNEL}"
     echo "zfs" > /usr/lib/modules-load.d/zfs.conf
 fi

packages.json

@@ -187,7 +187,9 @@
 	"39": {
 		"include": {
 			"all": [],
-			"silverblue": [],
+			"silverblue": [
+				"fmt"
+			],
 			"dx": [
 				"distrobuilder",
 				"podman-plugins"

system_files/shared/usr/bin/ublue-rollback-helper

@@ -14,8 +14,8 @@ function list_tags(){
 function rebase_helper(){
     base_image="ghcr.io/ublue-os/${IMAGE_NAME}"
     echo "Which Tag would you like to rebase to?"
-    echo "The default selection is gts, stable is for enthusiasts, and latest is for testers"
-    choose_target=$(Choose date latest gts stable cancel)
+    echo "The default selection is gts, stable (weekly builds) and stable-daily (daily builds) are for enthusiasts, and latest is for testers"
+    choose_target=$(Choose date latest gts stable stable-daily cancel)
     if [[ "$choose_target" != "date" && "$choose_target" != "cancel" ]]; then
         rebase_target="${base_image}:${choose_target}"
     elif [[ "$choose_target" == "date" ]]; then