Merge pull request #336 from ublue-os/move-surface

fix: Surface images have moved
This commit is contained in:
Kyle Gospodnetich 2023-09-20 08:56:03 -07:00 committed by GitHub
commit a55954db31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 30 deletions

View File

@ -35,7 +35,7 @@ jobs:
fail-fast: false
matrix:
image_flavor: [main, nvidia]
base_name: [bazzite, bazzite-surface, bazzite-deck]
base_name: [bazzite, bazzite-deck]
base_image_name: [kinoite, silverblue]
major_version: [38]
include:

View File

@ -207,35 +207,6 @@ RUN rm /usr/share/applications/shredder.desktop && \
chmod -R 1777 /var/tmp && \
ostree container commit
FROM bazzite as bazzite-surface
# Add Linux Surface repo
RUN wget https://pkg.surfacelinux.com/fedora/linux-surface.repo -P /etc/yum.repos.d
# Install Surface kernel
RUN wget https://github.com/linux-surface/linux-surface/releases/download/silverblue-20201215-1/kernel-20201215-1.x86_64.rpm -O \
/tmp/surface-kernel.rpm && \
rpm-ostree cliwrap install-to-root / && \
rpm-ostree override replace /tmp/surface-kernel.rpm \
--remove kernel-core \
--remove kernel-devel-matched \
--remove kernel-modules \
--remove kernel-modules-extra \
--remove libwacom \
--remove libwacom-data \
--install kernel-surface \
--install iptsd \
--install libwacom-surface \
--install libwacom-surface-data
# Cleanup & Finalize
RUN rm -rf \
/tmp/* \
/var/* && \
mkdir -p /var/tmp && \
chmod -R 1777 /var/tmp && \
ostree container commit
FROM bazzite as bazzite-deck
ARG IMAGE_NAME="${IMAGE_NAME}"