From 795f74f3832455695a3552e2113b98fe23da9f84 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 7 Oct 2024 18:30:33 -0700 Subject: [PATCH] chore: re-enable and then disable negativo17 multimedia repo for Steam chore: Disable all rpmfusion repos chore: Add Negativo17 steam repo --- Containerfile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Containerfile b/Containerfile index 477e3e68..ba028050 100644 --- a/Containerfile +++ b/Containerfile @@ -215,11 +215,12 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ curl -Lo /etc/yum.repos.d/_copr_rodoma92-kde-cdemu-manager.repo https://copr.fedorainfracloud.org/coprs/rodoma92/kde-cdemu-manager/repo/fedora-"${FEDORA_MAJOR_VERSION}"/rodoma92-kde-cdemu-manager-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ curl -Lo /etc/yum.repos.d/_copr_rodoma92-rmlint.repo https://copr.fedorainfracloud.org/coprs/rodoma92/rmlint/repo/fedora-"${FEDORA_MAJOR_VERSION}"/rodoma92-rmlint-fedora-"${FEDORA_MAJOR_VERSION}".repo && \ curl -Lo /etc/yum.repos.d/tailscale.repo https://pkgs.tailscale.com/stable/fedora/tailscale.repo && \ - curl -Lo /etc/yum.repos.d/negativo17-fedora-multimedia.repo https://negativo17.org/repos/fedora-multimedia.repo && \ rpm-ostree install \ https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \ https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \ sed -i 's@gpgcheck=1@gpgcheck=0@g' /etc/yum.repos.d/tailscale.repo && \ + sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ + curl -Lo /etc/yum.repos.d/negativo17-fedora-steam.repo https://negativo17.org/repos/fedora-steam.repo && \ /usr/libexec/containerbuild/cleanup.sh && \ ostree container commit @@ -324,7 +325,6 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ /tmp/akmods-extra-rpms/kmods/*bmi260*.rpm \ /tmp/akmods-extra-rpms/kmods/*ryzen-smu*.rpm \ /tmp/akmods-extra-rpms/kmods/*evdi*.rpm && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ rpm-ostree override replace \ --experimental \ --from repo=copr:copr.fedorainfracloud.org:ublue-os:staging \ @@ -332,9 +332,7 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ fwupd-plugin-flashrom \ fwupd-plugin-modem-manager \ fwupd-plugin-uefi-capsule-data && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree-updates.repo && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-nonfree-updates-testing.repo && \ + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-*.repo && \ /usr/libexec/containerbuild/cleanup.sh && \ ostree container commit @@ -365,12 +363,12 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ bluez-cups \ bluez-libs \ xorg-x11-server-Xwayland && \ - sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \ + sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/rpmfusion-*.repo && \ rpm-ostree install \ libaacs \ libbdplus \ libbluray && \ - sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \ + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-*.repo && \ rpm-ostree override replace \ --experimental \ --from repo=copr:copr.fedorainfracloud.org:sentry:switcheroo-control_discrete \ @@ -522,14 +520,14 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ mesa-va-drivers.i686 \ vkBasalt.x86_64 \ vkBasalt.i686 \ + mangohud.x86_64 \ + mangohud.i686 \ obs-vkcapture.x86_64 \ libobs_vkcapture.x86_64 \ libobs_glcapture.x86_64 \ obs-vkcapture.i686 \ libobs_vkcapture.i686 \ - libobs_glcapture.i686 \ - mangohud.x86_64 \ - mangohud.i686 && \ + libobs_glcapture.i686 && \ ln -s wine32 /usr/bin/wine && \ ln -s wine32-preloader /usr/bin/wine-preloader && \ ln -s wineserver64 /usr/bin/wineserver && \ @@ -729,6 +727,8 @@ RUN rm -f /etc/profile.d/toolbox.sh && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_hikariknight-looking-glass-kvmfr.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/tailscale.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/charm.repo && \ + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-steam.repo && \ mkdir -p /etc/flatpak/remotes.d && \ curl -Lo /etc/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo && \ systemctl enable tuned.service && \