From 2e6d5af2bdc592c057bc0d3794e4fac366f0c815 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Fri, 9 Aug 2024 14:42:44 -0700 Subject: [PATCH 01/13] chore(ci): Update rechunkcer to v0.8.3 --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d714481..5f9a869c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -149,7 +149,7 @@ jobs: sudo podman pull ${{ env.IMAGE_REGISTRY }}/akmods-nvidia:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }} # Add rechunk as well to remove this source of failure - sudo podman pull ghcr.io/hhd-dev/rechunk:v0.5.0 + sudo podman pull ghcr.io/hhd-dev/rechunk:v0.8.3 - name: Get source versions id: labels @@ -236,9 +236,9 @@ jobs: # Reprocess raw-img using rechunker which will delete it - name: Run Rechunker id: rechunk - uses: hhd-dev/rechunk@v0.8.1 + uses: hhd-dev/rechunk@v0.8.3 with: - rechunk: 'ghcr.io/hhd-dev/rechunk:v0.8.1' + rechunk: 'ghcr.io/hhd-dev/rechunk:v0.8.3' ref: 'raw-img' prev-ref: ${{ github.event.inputs.fresh-rechunk == 'true' && '' || 'ghcr.io/ublue-os/bazzite:unstable' }} version: '${{ steps.generate-version.outputs.tag }}' From 3d3b3bd8bf14c8dac37c6f55f4037f1960e4784f Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 13 Aug 2024 21:59:29 -0700 Subject: [PATCH 02/13] chore: Temporarily remove evdi/displaylink until fixed upstream --- Containerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Containerfile b/Containerfile index 075a5b82..4149cba8 100644 --- a/Containerfile +++ b/Containerfile @@ -263,7 +263,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ /tmp/akmods-rpms/kmods/*openrazer*.rpm \ /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \ /tmp/akmods-rpms/kmods/*wl*.rpm \ - /tmp/akmods-rpms/kmods/*evdi*.rpm \ /tmp/akmods-rpms/kmods/*framework-laptop*.rpm \ /tmp/akmods-extra-rpms/kmods/*gcadapter_oc*.rpm \ /tmp/akmods-extra-rpms/kmods/*nct6687*.rpm \ @@ -689,7 +688,6 @@ RUN rm -f /etc/profile.d/toolbox.sh && \ systemctl enable brew-upgrade.timer && \ systemctl enable brew-update.timer && \ systemctl enable btrfs-dedup@var-home.timer && \ - systemctl enable displaylink.service && \ systemctl enable input-remapper.service && \ systemctl unmask bazzite-flatpak-manager.service && \ systemctl enable bazzite-flatpak-manager.service && \ From f9d02c1296de9305797bf6e1c4807bab5cb944d5 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 13 Aug 2024 22:28:10 -0700 Subject: [PATCH 03/13] chore: Remove no longer needed libwayland replacement --- Containerfile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Containerfile b/Containerfile index 4149cba8..7f4842ac 100644 --- a/Containerfile +++ b/Containerfile @@ -280,13 +280,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ fwupd-plugin-flashrom \ fwupd-plugin-modem-manager \ fwupd-plugin-uefi-capsule-data && \ - rpm-ostree override replace \ - --experimental \ - --from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \ - libwayland-client \ - libwayland-server \ - libwayland-cursor \ - libwayland-egl && \ /usr/libexec/containerbuild/cleanup.sh && \ ostree container commit From 063d8828a0b738245ce798787b2d3a2c6550dc0e Mon Sep 17 00:00:00 2001 From: yassin <135610141+achengli@users.noreply.github.com> Date: Sun, 18 Aug 2024 01:45:50 +0200 Subject: [PATCH 04/13] Performance issue with fish shell (#1483) The fish shell takes a long time to open an instance, this is because an instance of Brew is running to initialize packages when it is certainly not required to activate it, for example, open a simple terminal to edit some file Co-authored-by: achengli --- .../usr/share/fish/vendor_conf.d/brew.fish | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/system_files/overrides/usr/share/fish/vendor_conf.d/brew.fish b/system_files/overrides/usr/share/fish/vendor_conf.d/brew.fish index 1ddb1c68..c0d51f0f 100644 --- a/system_files/overrides/usr/share/fish/vendor_conf.d/brew.fish +++ b/system_files/overrides/usr/share/fish/vendor_conf.d/brew.fish @@ -1,18 +1,32 @@ #!/usr/bin/fish #shellcheck disable=all -if status --is-interactive - if [ -d /home/linuxbrew/.linuxbrew ] +set -g __brew_instance_initialize 0 +set -g __brew_binary /home/linuxbrew/.linuxbrew/bin/brew + +function brew_new_instance + alias brew=$__brew_binary + if test $__brew_instance_initialize = 0 + if status --is-interactive + if [ -d /home/linuxbrew/.linuxbrew ] eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)" if [ -w /home/linuxbrew/.linuxbrew ] - if [ ! -L (brew --prefix)/share/fish/vendor_completions.d/brew ] - brew completions link > /dev/null - end + if [ ! -L (brew --prefix)/share/fish/vendor_completions.d/brew ] + brew completions link > /dev/null + end end if test -d (brew --prefix)/share/fish/completions - set -p fish_complete_path (brew --prefix)/share/fish/completions + set -p fish_complete_path (brew --prefix)/share/fish/completions end if test -d (brew --prefix)/share/fish/vendor_completions.d - set -p fish_complete_path (brew --prefix)/share/fish/vendor_completions.d + set -p fish_complete_path (brew --prefix)/share/fish/vendor_completions.d end + end end + set __brew_instance_initialize 1 + brew $argv + end end + +alias brew=brew_new_instance + + From e25ecac92f348a5ebae40c3018b2eeef3f3976f3 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sat, 17 Aug 2024 18:32:06 -0700 Subject: [PATCH 05/13] chore(ci): Fix syntax issue preventing builds --- .github/workflows/build.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5672ba93..1807d311 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -233,6 +233,22 @@ jobs: sudo podman image rm ${{ env.IMAGE_REGISTRY }}/akmods:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }} sudo podman image rm ${{ env.IMAGE_REGISTRY }}/akmods-nvidia:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }} + # Generate the previous image reference used by the Rechunker + - name: Generate previous reference + id: generate-prev-ref + shell: bash + run: | + if [ "${{ github.event.inputs.fresh-rechunk }}" == "true" ]; then + IMAGEREF="" + else + IMAGEREF="${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}" + fi + + echo "ref=${IMAGEREF}" >> $GITHUB_OUTPUT + + echo "Generated the following:" + cat $GITHUB_OUTPUT + # Reprocess raw-img using rechunker which will delete it - name: Run Rechunker id: rechunk @@ -240,7 +256,7 @@ jobs: with: rechunk: 'ghcr.io/hhd-dev/rechunk:v0.8.3' ref: 'raw-img' - prev-ref: ${{ github.event.inputs.fresh-rechunk == 'true' && '' || "${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}:stable" }} + prev-ref: ${{ steps.generate-prev-ref.outputs.ref }} version: '${{ steps.generate-version.outputs.tag }}' labels: | io.artifacthub.package.logo-url=https://raw.githubusercontent.com/ublue-os/bazzite/main/repo_content/logo.png From 68a352de26311e041fcdb3104e7af2162d243908 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sun, 18 Aug 2024 19:48:11 -0700 Subject: [PATCH 06/13] chore: Temporarily fix SDL2 dependency issue --- Containerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Containerfile b/Containerfile index a12bc929..16f42892 100644 --- a/Containerfile +++ b/Containerfile @@ -159,6 +159,9 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ --from repo=updates \ libv4l \ || true && \ + rpm-ostree install \ + https://kojipkgs.fedoraproject.org//packages/SDL2/2.30.3/1.fc40/i686/SDL2-2.30.3-1.fc40.i686.rpm \ + || true && \ rpm-ostree override remove \ glibc32 \ || true && \ From 1d0a5c1206adeefdeceb6c4a2859fcae69664a6a Mon Sep 17 00:00:00 2001 From: Antheas Kapenekakis Date: Mon, 19 Aug 2024 04:49:45 +0200 Subject: [PATCH 07/13] chore(rechunk): always use stable tag (#1515) --- .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 1807d311..45878b78 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -241,7 +241,7 @@ jobs: if [ "${{ github.event.inputs.fresh-rechunk }}" == "true" ]; then IMAGEREF="" else - IMAGEREF="${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}" + IMAGEREF="${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}:stable" fi echo "ref=${IMAGEREF}" >> $GITHUB_OUTPUT From 79fafc9fa12c79b3347d0d286cda9f3086d5cdb3 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sun, 18 Aug 2024 20:06:33 -0700 Subject: [PATCH 08/13] chore: Move to Steam section --- Containerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Containerfile b/Containerfile index 16f42892..7bcafc64 100644 --- a/Containerfile +++ b/Containerfile @@ -159,9 +159,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ --from repo=updates \ libv4l \ || true && \ - rpm-ostree install \ - https://kojipkgs.fedoraproject.org//packages/SDL2/2.30.3/1.fc40/i686/SDL2-2.30.3-1.fc40.i686.rpm \ - || true && \ rpm-ostree override remove \ glibc32 \ || true && \ @@ -441,7 +438,8 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ libatomic.i686 \ pipewire-alsa.i686 \ gobject-introspection \ - clinfo && \ + clinfo \ + https://kojipkgs.fedoraproject.org//packages/SDL2/2.30.3/1.fc40/i686/SDL2-2.30.3-1.fc40.i686.rpm && \ sed -i '0,/enabled=1/s//enabled=0/' /etc/yum.repos.d/fedora-updates.repo && \ rpm-ostree install \ mesa-vulkan-drivers.i686 \ From f92d1753145ac5fe647babd03df9542b8796ed2a Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sun, 18 Aug 2024 20:27:25 -0700 Subject: [PATCH 09/13] chore(ci): Fix registry name --- .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 45878b78..09bddef1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -241,7 +241,7 @@ jobs: if [ "${{ github.event.inputs.fresh-rechunk }}" == "true" ]; then IMAGEREF="" else - IMAGEREF="${{ steps.registry_case.outputs.lowercase }}/${{ env.IMAGE_NAME }}:stable" + IMAGEREF="${{ env.IMAGE_REGISTRY }}/${{ env.IMAGE_NAME }}:stable" fi echo "ref=${IMAGEREF}" >> $GITHUB_OUTPUT From 9e7d08eb12f0863da5d64a4f839b5e9a46927f72 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 19 Aug 2024 18:27:22 -0700 Subject: [PATCH 10/13] chore: Remove BAZZITE_VERSION from build versions --- .github/workflows/build.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index feb4a99f..24bd1644 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,7 +63,6 @@ jobs: fedora_version: [40] include: - fedora_version: 40 - bazzite_version: "v3.6" is_latest_version: true is_stable_version: true kernel_flavor: fsync # must match a kernel_flavor from akmods repo @@ -185,7 +184,6 @@ jobs: # shown on the bootloader, and used for the image tag. UPSTREAM_TAG="${{ env.SOURCE_IMAGE_VERSION }}" FEDORA_VERSION="${{ matrix.fedora_version }}" - BAZZITE_VERSION="${{ matrix.bazzite_version }}" SHA_SHORT="${GITHUB_SHA::7}" if [ -n "${{ github.event.pull_request.number }}" ]; then @@ -195,11 +193,11 @@ jobs: VERSION="unstable-${SHA_SHORT}" PRETTY_VERSION="Unstable (#${SHA_SHORT}, F${UPSTREAM_TAG})" elif [[ ${{ github.ref_name }} == "testing" ]]; then - VERSION="testing-${BAZZITE_VERSION}-${UPSTREAM_TAG}" - PRETTY_VERSION="Testing (${BAZZITE_VERSION}, F${UPSTREAM_TAG})" + VERSION="testing-${UPSTREAM_TAG}" + PRETTY_VERSION="Testing (F${UPSTREAM_TAG})" else - VERSION="${BAZZITE_VERSION}-${UPSTREAM_TAG}" - PRETTY_VERSION="Stable (${BAZZITE_VERSION}, F${UPSTREAM_TAG})" + VERSION="${UPSTREAM_TAG}" + PRETTY_VERSION="Stable (F${UPSTREAM_TAG})" fi echo "tag=${VERSION}" >> $GITHUB_OUTPUT echo "pretty=${PRETTY_VERSION}" >> $GITHUB_OUTPUT @@ -281,7 +279,6 @@ jobs: VERSION_TAG="${{ steps.rechunk.outputs.version }}" UPSTREAM_TAG="${{ env.SOURCE_IMAGE_VERSION }}" FEDORA_VERSION="${{ matrix.fedora_version }}" - BAZZITE_VERSION="${{ matrix.bazzite_version }}" SHA_SHORT="${GITHUB_SHA::7}" BUILD_TAGS=( "${VERSION_TAG}" ) @@ -317,13 +314,11 @@ jobs: BUILD_TAGS+=("testing-${UPSTREAM_TAG}") if [ -n "$LATEST" ]; then - BUILD_TAGS+=("testing-${BAZZITE_VERSION}") BUILD_TAGS+=("testing") fi else BUILD_TAGS+=("${FEDORA_VERSION}") BUILD_TAGS+=("${UPSTREAM_TAG}") - BUILD_TAGS+=("${BAZZITE_VERSION}") BUILD_TAGS+=("stable-${UPSTREAM_TAG}") # Per fedora version From ebf79e05eb46260c2a491b117ba059482cda26e9 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 19 Aug 2024 20:04:31 -0700 Subject: [PATCH 11/13] chore: Prepare for pinned Kernel releases --- .github/workflows/build.yml | 12 +++--------- Containerfile | 6 +++++- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 24bd1644..00596c5b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,6 +61,7 @@ jobs: base_image_name: [kinoite, silverblue] target_image_flavor: [main, asus] fedora_version: [40] + kernel_version: [6.10.4-201.fsync.fc40.x86_64] include: - fedora_version: 40 is_latest_version: true @@ -165,14 +166,6 @@ jobs: exit 1 fi echo "SOURCE_IMAGE_VERSION=$ver" >> $GITHUB_ENV - - skopeo inspect docker://${{ env.IMAGE_REGISTRY }}/akmods:${{ matrix.kernel_flavor }}-${{ matrix.fedora_version }} > akmods.json - linux=$(jq -r '.Labels["ostree.linux"]' akmods.json) - if [ -z "$linux" ] || [ "null" = "$linux" ]; then - echo "inspected image linux version must not be empty or null" - exit 1 - fi - echo "KERNEL_VERSION=$linux" >> $GITHUB_ENV # Generate a primary version key that appears # in KDE, rpm-ostree status, and github. @@ -218,6 +211,7 @@ jobs: --build-arg BASE_IMAGE_FLAVOR=${{ matrix.base_image_flavor }} \ --build-arg FEDORA_VERSION=${{ matrix.fedora_version }} \ --build-arg KERNEL_FLAVOR=${{ matrix.kernel_flavor }} \ + --build-arg KERNEL_VERSION=${{ matrix.kernel_version }} \ --build-arg IMAGE_BRANCH=${{ github.ref_name }} \ --build-arg SHA_HEAD_SHORT=${{ env.SHA_HEAD_SHORT }} \ --build-arg VERSION_TAG=${{ steps.generate-version.outputs.tag }} \ @@ -356,7 +350,7 @@ jobs: sudo apt install sbsigntool curl openssl fi TMP=$(podman create rechunked-img bash) - podman cp $TMP:/usr/lib/modules/${{ env.KERNEL_VERSION }}/vmlinuz . + podman cp $TMP:/usr/lib/modules/${{ matrix.kernel_version }}/vmlinuz . podman rm $TMP sbverify --list vmlinuz curl --retry 3 -Lo kernel-sign.der https://github.com/ublue-os/kernel-cache/raw/main/certs/public_key.der diff --git a/Containerfile b/Containerfile index 7bcafc64..6702f497 100644 --- a/Containerfile +++ b/Containerfile @@ -2,6 +2,7 @@ ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}" ARG BASE_IMAGE_FLAVOR="${BASE_IMAGE_FLAVOR:-main}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync}" +ARG KERNEL_VERSION="${KERNEL_VERSION:-6.10.4-201.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}" @@ -11,9 +12,9 @@ ARG SHA_HEAD_SHORT="${SHA_HEAD_SHORT}" ARG VERSION_TAG="${VERSION_TAG}" ARG VERSION_PRETTY="${VERSION_PRETTY}" +FROM ghcr.io/ublue-os/fsync-kernel:${KERNEL_VERSION} AS fsync FROM ghcr.io/ublue-os/akmods:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION} AS akmods FROM ghcr.io/ublue-os/akmods-extra:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION} AS akmods-extra -FROM ghcr.io/ublue-os/fsync-kernel:${FEDORA_MAJOR_VERSION} AS fsync FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bazzite @@ -21,6 +22,7 @@ ARG IMAGE_NAME="${IMAGE_NAME:-bazzite}" ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync}" +ARG KERNEL_VERSION="${KERNEL_VERSION:-6.10.4-201.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}" @@ -712,6 +714,7 @@ ARG IMAGE_NAME="${IMAGE_NAME:-bazzite-deck}" ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync}" +ARG KERNEL_VERSION="${KERNEL_VERSION:-6.10.4-201.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}" @@ -863,6 +866,7 @@ ARG IMAGE_NAME="${IMAGE_NAME:-bazzite-nvidia}" ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}" ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-nvidia}" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-fsync}" +ARG KERNEL_VERSION="${KERNEL_VERSION:-6.10.4-201.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 19bed74d64e4cef1cdbeeb5ba0b2fbe5a9eb02a8 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 20 Aug 2024 08:43:15 -0700 Subject: [PATCH 12/13] chore(ci): Use fully qualified fedora_version-kernel_version tag for akmods and kernel-cache. --- .github/workflows/build.yml | 8 ++++---- Containerfile | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 00596c5b..1acf6024 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -145,8 +145,8 @@ jobs: # pull the base images used for FROM in Containerfile so # we can retry on that unfortunately common failure case sudo podman pull ${{ env.IMAGE_REGISTRY }}/${{ matrix.base_image_name }}-${{ matrix.base_image_flavor }}:${{ matrix.fedora_version }} - sudo podman pull ${{ env.IMAGE_REGISTRY }}/akmods:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }} - sudo podman pull ${{ env.IMAGE_REGISTRY }}/akmods-nvidia:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }} + sudo podman pull ${{ env.IMAGE_REGISTRY }}/akmods:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-%{{ matrix.kernel_version }} + sudo podman pull ${{ env.IMAGE_REGISTRY }}/akmods-nvidia:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-%{{ matrix.kernel_version }} # Add rechunk as well to remove this source of failure sudo podman pull ghcr.io/hhd-dev/rechunk:v0.8.3 @@ -222,8 +222,8 @@ jobs: # We are tight on space, need at least 2x for OSTree run: | sudo podman image rm ${{ env.IMAGE_REGISTRY }}/${{ matrix.base_image_name }}-${{ matrix.base_image_flavor }}:${{ matrix.fedora_version }} - sudo podman image rm ${{ env.IMAGE_REGISTRY }}/akmods:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }} - sudo podman image rm ${{ env.IMAGE_REGISTRY }}/akmods-nvidia:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }} + sudo podman image rm ${{ env.IMAGE_REGISTRY }}/akmods:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-%{{ matrix.kernel_version }} + sudo podman image rm ${{ env.IMAGE_REGISTRY }}/akmods-nvidia:${{ matrix.kernel_flavor}}-${{ matrix.fedora_version }}-%{{ matrix.kernel_version }} # Generate the previous image reference used by the Rechunker - name: Generate previous reference diff --git a/Containerfile b/Containerfile index 6702f497..15b2b4af 100644 --- a/Containerfile +++ b/Containerfile @@ -12,9 +12,9 @@ ARG SHA_HEAD_SHORT="${SHA_HEAD_SHORT}" ARG VERSION_TAG="${VERSION_TAG}" ARG VERSION_PRETTY="${VERSION_PRETTY}" -FROM ghcr.io/ublue-os/fsync-kernel:${KERNEL_VERSION} AS fsync -FROM ghcr.io/ublue-os/akmods:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION} AS akmods -FROM ghcr.io/ublue-os/akmods-extra:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION} AS akmods-extra +FROM ghcr.io/ublue-os/fsync-kernel:${FEDORA_MAJOR_VERSION}-${KERNEL_VERSION} AS fsync +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 ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bazzite @@ -858,7 +858,7 @@ RUN /usr/libexec/containerbuild/image-info && \ mkdir -p /var/tmp && chmod 1777 /var/tmp && \ ostree container commit -FROM ghcr.io/ublue-os/akmods-nvidia:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION} AS nvidia-akmods +FROM ghcr.io/ublue-os/akmods-nvidia:${KERNEL_FLAVOR}-${FEDORA_MAJOR_VERSION}-${KERNEL_VERSION} AS nvidia-akmods FROM bazzite AS bazzite-nvidia From c47e12521e32fe35dd0b04abda890115285d725b Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 20 Aug 2024 08:46:19 -0700 Subject: [PATCH 13/13] chore: Remove unneeded workarounds for caps --- Containerfile | 3 +-- .../system/kde-sysmonitor-workaround.service | 20 ------------------ .../tmpfiles.d/kde-sysmonitor-workaround.conf | 1 - .../system/gamescope-workaround.service | 21 ------------------- .../lib/tmpfiles.d/gamescope-workaround.conf | 1 - 5 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 system_files/desktop/kinoite/usr/lib/systemd/system/kde-sysmonitor-workaround.service delete mode 100644 system_files/desktop/kinoite/usr/lib/tmpfiles.d/kde-sysmonitor-workaround.conf delete mode 100644 system_files/desktop/shared/usr/lib/systemd/system/gamescope-workaround.service delete mode 100644 system_files/desktop/shared/usr/lib/tmpfiles.d/gamescope-workaround.conf diff --git a/Containerfile b/Containerfile index 15b2b4af..152e65c1 100644 --- a/Containerfile +++ b/Containerfile @@ -536,7 +536,7 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ cp /usr/share/applications/org.gnome.Ptyxis.desktop /usr/share/kglobalaccel/org.gnome.Ptyxis.desktop && \ sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/org.kde.konsole.desktop && \ rm -f /usr/share/kglobalaccel/org.kde.konsole.desktop && \ - systemctl enable kde-sysmonitor-workaround.service \ + setcap 'cap_net_raw+ep' /usr/libexec/ksysguard/ksgrd_network_helper \ ; else \ rpm-ostree override replace \ --experimental \ @@ -689,7 +689,6 @@ RUN rm -f /etc/profile.d/toolbox.sh && \ systemctl enable bazzite-flatpak-manager.service && \ systemctl disable rpm-ostreed-automatic.timer && \ systemctl enable ublue-update.timer && \ - systemctl enable gamescope-workaround.service && \ systemctl enable incus-workaround.service && \ systemctl enable bazzite-hardware-setup.service && \ systemctl enable tailscaled.service && \ diff --git a/system_files/desktop/kinoite/usr/lib/systemd/system/kde-sysmonitor-workaround.service b/system_files/desktop/kinoite/usr/lib/systemd/system/kde-sysmonitor-workaround.service deleted file mode 100644 index 2bef6b04..00000000 --- a/system_files/desktop/kinoite/usr/lib/systemd/system/kde-sysmonitor-workaround.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=Workaround KDE System Monitor not having the correct caps -ConditionFileIsExecutable=/usr/libexec/ksysguard/ksgrd_network_helper -After=local-fs.target - -[Service] -Type=oneshot -# Copy if it doesn't exist -ExecStartPre=/usr/bin/bash -c "[ -x /usr/local/libexec/.ksysguard/ksgrd_network_helper ] || /usr/bin/cp /usr/libexec/ksysguard/ksgrd_network_helper /usr/local/libexec/.ksysguard/ksgrd_network_helper" -# This is faster than using .mount unit. Also allows for the previous line/cleanup -ExecStartPre=/usr/bin/mount --bind /usr/local/libexec/.ksysguard/ksgrd_network_helper /usr/libexec/ksysguard/ksgrd_network_helper -# Fix caps -ExecStart=/usr/sbin/setcap 'cap_net_raw+ep' /usr/libexec/ksysguard/ksgrd_network_helper -# Clean-up after ourselves -ExecStop=/usr/bin/umount /usr/libexec/ksysguard/ksgrd_network_helper -ExecStop=/usr/bin/rm /usr/local/libexec/.ksysguard/ksgrd_network_helper -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/system_files/desktop/kinoite/usr/lib/tmpfiles.d/kde-sysmonitor-workaround.conf b/system_files/desktop/kinoite/usr/lib/tmpfiles.d/kde-sysmonitor-workaround.conf deleted file mode 100644 index 4bc92bc6..00000000 --- a/system_files/desktop/kinoite/usr/lib/tmpfiles.d/kde-sysmonitor-workaround.conf +++ /dev/null @@ -1 +0,0 @@ -C /usr/local/libexec/.ksysguard/ksgrd_network_helper - - - - /usr/libexec/ksysguard/ksgrd_network_helper diff --git a/system_files/desktop/shared/usr/lib/systemd/system/gamescope-workaround.service b/system_files/desktop/shared/usr/lib/systemd/system/gamescope-workaround.service deleted file mode 100644 index 379bd596..00000000 --- a/system_files/desktop/shared/usr/lib/systemd/system/gamescope-workaround.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Workaround gamescope not having the correct caps -ConditionFileIsExecutable=/usr/bin/gamescope -After=local-fs.target -Before=graphical-session-pre.target - -[Service] -Type=oneshot -# Copy if it doesn't exist -ExecStartPre=/usr/bin/bash -c "[ -x /usr/local/bin/.gamescope ] || /usr/bin/cp /usr/bin/gamescope /usr/local/bin/.gamescope" -# This is faster than using .mount unit. Also allows for the previous line/cleanup -ExecStartPre=/usr/bin/mount --bind /usr/local/bin/.gamescope /usr/bin/gamescope -# Fix caps -ExecStart=/usr/sbin/setcap 'cap_sys_nice=eip' /usr/bin/gamescope -# Clean-up after ourselves -ExecStop=/usr/bin/umount /usr/bin/gamescope -ExecStop=/usr/bin/rm /usr/local/bin/.gamescope -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/system_files/desktop/shared/usr/lib/tmpfiles.d/gamescope-workaround.conf b/system_files/desktop/shared/usr/lib/tmpfiles.d/gamescope-workaround.conf deleted file mode 100644 index 2edb44fa..00000000 --- a/system_files/desktop/shared/usr/lib/tmpfiles.d/gamescope-workaround.conf +++ /dev/null @@ -1 +0,0 @@ -C /usr/local/bin/.gamescope - - - - /usr/bin/gamescope