diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 9bc3168..93c0560 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -223,7 +223,6 @@ jobs: FEDORA_MAJOR_VERSION=${{ matrix.fedora_version }} KERNEL_FLAVOR=${{ matrix.kernel_flavor }} KERNEL_VERSION=${{ env.KERNEL_VERSION }} - RPMFUSION_MIRROR=${{ vars.RPMFUSION_MIRROR }} labels: ${{ steps.meta.outputs.labels }} oci: false extra-args: | diff --git a/Containerfile b/Containerfile index bd6d072..013e4b5 100644 --- a/Containerfile +++ b/Containerfile @@ -16,7 +16,6 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-main}" ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}" -ARG RPMFUSION_MIRROR="" ARG KERNEL_VERSION="${KERNEL_VERSION:-6.9.7-200.fc40.x86_64}" RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ @@ -41,7 +40,6 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}" ARG KERNEL_FLAVOR="${KERNEL_FLAVOR:-main}" ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" ARG IMAGE_VENDOR="${IMAGE_VENDOR:-ublue-os}" -ARG RPMFUSION_MIRROR="" RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ --mount=type=bind,from=ctx,src=/,dst=/ctx \ diff --git a/install.sh b/install.sh index b66706d..c5c8100 100755 --- a/install.sh +++ b/install.sh @@ -9,19 +9,8 @@ if [ "${KERNEL_FLAVOR}" = "main" ]; then exit 0 fi -# after F41 launches, bump to 42 -if [[ "${FEDORA_MAJOR_VERSION}" -ge 41 ]]; then - # note: this is done before single mirror hack to ensure this persists in image and is not reset - # pre-release rpmfusion is in a different location - sed -i "s%free/fedora/releases%free/fedora/development%" /etc/yum.repos.d/rpmfusion-*.repo -fi - -if [ -n "${RPMFUSION_MIRROR}" ]; then - # force use of single rpmfusion mirror - echo "Using single rpmfusion mirror: ${RPMFUSION_MIRROR}" - sed -i.bak "s%^metalink=%#metalink=%" /etc/yum.repos.d/rpmfusion-*.repo - sed -i "s%^#baseurl=http://download1.rpmfusion.org%baseurl=${RPMFUSION_MIRROR}%" /etc/yum.repos.d/rpmfusion-*.repo -fi +# disable any remaining rpmfusion repos +sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion*.repo # do HWE specific things if [ "${KERNEL_FLAVOR}" = "asus" ]; then @@ -99,10 +88,4 @@ else echo "install.sh: post-install for unexpected KERNEL_FLAVOR: ${KERNEL_FLAVOR}" fi -if [ -n "${RPMFUSION_MIRROR}" ]; then - # reset forced use of single rpmfusion mirror - echo "Revert from single rpmfusion mirror: ${RPMFUSION_MIRROR}" - rename -v .repo.bak .repo /etc/yum.repos.d/rpmfusion-*repo.bak -fi - /ctx/build-initramfs.sh diff --git a/nvidia-install.sh b/nvidia-install.sh index 8e0d4d7..ca274b1 100755 --- a/nvidia-install.sh +++ b/nvidia-install.sh @@ -4,22 +4,19 @@ set -ouex pipefail RELEASE="$(rpm -E %fedora)" -sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo +# disable any remaining rpmfusion repos +sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion*.repo -# after F41 launches, bump to 42 -if [[ "${FEDORA_MAJOR_VERSION}" -ge 41 ]]; then - # note: this is done before single mirror hack to ensure this persists in image and is not reset - # pre-release rpmfusion is in a different location - sed -i "s%free/fedora/releases%free/fedora/development%" /etc/yum.repos.d/rpmfusion-*.repo -fi +sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo ## nvidia install steps rpm-ostree install /tmp/akmods-rpms/ublue-os/ublue-os-nvidia-addons-*.rpm # enables nvidia repos provided by ublue-os-nvidia-addons sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/eyecantcu-supergfxctl.repo -sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/nvidia-container-toolkit.repo +#NOTE: nvidia drivers are already provided by negativo17-fedora-multimedia.repo, no need to enable +#sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo source /tmp/akmods-rpms/kmods/nvidia-vars