Merge pull request #35 from Ultramarine-Linux/fix-um41-builds

fix 41 builds

.github/workflows/build-docker.yml

@@ -74,6 +74,7 @@ jobs:
     steps:
       - name: Install dependencies
         run: |
+          dnf up -y
           dnf install -y $DNF_PKGS
           dnf clean all
 

.github/workflows/build-katsu.yml

@@ -89,6 +89,7 @@ jobs:
     steps:
       - name: Install dependencies
         run: |
+          dnf up -y
           dnf install -y $DNF_PKGS
           dnf clean all
       - name: Checkout
@@ -146,6 +147,7 @@ jobs:
     steps:
       - name: Install dependencies
         run: |
+          dnf up -y
           dnf install -y $DNF_PKGS
           dnf clean all
       - name: sanitize artifact name

README.md

@@ -22,10 +22,10 @@ Ultramarine also offers a minimal base Docker image, in rare cases when you want
 
 The image itself is similar to the vanilla Fedora image, but includes the Ultramarine Linux repositories and RPMFusion repositories. This may prove useful for some users who want a Fedora-like environment, but with some extra packages.
 
-## Status of Images (UM40)
+## Status of Images (UM41)
 
 ### Notes
 
 - Pantheon is not currently being built
 - Chromebook images are shown as failing due to me not setting them up to build yet
-- 
+-

katsu/modules/base/base-disk-aarch64.yaml

@@ -14,6 +14,7 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: aarch64
   packages:
     - ultramarine-release-identity-basic

katsu/modules/base/base-disk-x86_64.yaml

@@ -14,6 +14,7 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     - ultramarine-release-identity-basic
     - ultramarine-release-basic

katsu/modules/base/base-disk.yaml

@@ -8,6 +8,7 @@ scripts:
       file: disk-setup.sh
 dnf:
   releasever: 41
+  exec: dnf4
   options:
     - --setopt=cachedir=/var/cache/dnf
     - --setopt=keepcache=True

katsu/modules/base/base-docker-aarch64.yaml

@@ -6,4 +6,5 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: aarch64

katsu/modules/base/base-docker-x86_64.yaml

@@ -6,4 +6,5 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: x86_64

katsu/modules/base/base-docker.yaml

@@ -3,6 +3,7 @@ builder: dnf
 dnf:
   repodir: repodir/
   releasever: 41
+  exec: dnf4
   options:
     - --setopt=cachedir=/var/cache/dnf
     - --setopt=keepcache=True

katsu/modules/base/base.yaml

@@ -13,7 +13,8 @@ scripts:
       file: buildstamp.sh
 
 dnf:
-  releasever: 40
+  releasever: 41
+  exec: dnf4
   repodir: repodir
   options:
     - --setopt=cachedir=/var/cache/dnf
@@ -76,4 +77,3 @@ dnf:
 #     - ultramarine-release
 #     - ultramarine-repos
 #     - "ultramarine-logos*"
-

katsu/modules/base/repodir/fedora-updates.repo

@@ -1,6 +1,6 @@
 [updates]
 name=Fedora $releasever - $basearch - Updates
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/
+#baseurl=https://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
 enabled=1
 countme=1
@@ -13,7 +13,7 @@ skip_if_unavailable=False
 
 [updates-debuginfo]
 name=Fedora $releasever - $basearch - Updates - Debug
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
+#baseurl=https://download.example/pub/fedora/linux/updates/$releasever/Everything/$basearch/debug/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-debug-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0
@@ -25,7 +25,7 @@ skip_if_unavailable=False
 
 [updates-source]
 name=Fedora $releasever - Updates Source
-#baseurl=http://download.example/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
+#baseurl=https://download.example/pub/fedora/linux/updates/$releasever/Everything/SRPMS/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-source-f$releasever&arch=$basearch
 enabled=0
 repo_gpgcheck=0

katsu/modules/base/repodir/fedora.repo

@@ -1,6 +1,6 @@
 [fedora]
 name=Fedora $releasever - $basearch
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
+#baseurl=https://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
 enabled=1
 countme=1
@@ -13,7 +13,7 @@ skip_if_unavailable=False
 
 [fedora-debuginfo]
 name=Fedora $releasever - $basearch - Debug
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
+#baseurl=https://download.example/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
@@ -25,7 +25,7 @@ skip_if_unavailable=False
 
 [fedora-source]
 name=Fedora $releasever - Source
-#baseurl=http://download.example/pub/fedora/linux/releases/$releasever/Everything/source/tree/
+#baseurl=https://download.example/pub/fedora/linux/releases/$releasever/Everything/source/tree/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d

katsu/modules/base/repodir/rpmfusion-free-tainted.repo

@@ -1,7 +1,8 @@
+# TODO: We're bypassing their mirrors because they're broken atm
 [rpmfusion-free-tainted]
 name=RPM Fusion for Fedora $releasever - Free tainted
-#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-$releasever&arch=$basearch
 enabled=1
 metadata_expire=6h
 type=rpm-md
@@ -11,8 +12,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-tainted-debuginfo]
 name=RPM Fusion for Fedora $releasever - Free tainted - Debug
-#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-debug-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/tainted/$releasever/$basearch/debug/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=6h
 type=rpm-md
@@ -22,12 +23,11 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-tainted-source]
 name=RPM Fusion for Fedora $releasever - Free tainted - Source
-#baseurl=http://download1.rpmfusion.org/free/fedora/tainted/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-source-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/tainted/$releasever/SRPMS/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-tainted-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=6h
 type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-

katsu/modules/base/repodir/rpmfusion-free-updates.repo

@@ -1,18 +1,19 @@
+# TODO: We're bypassing their mirrors because they're broken
 [rpmfusion-free-updates]
 name=RPM Fusion for Fedora $releasever - Free - Updates
-#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch
-enabled=1
-enabled_metadata=1
+baseurl=https://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-$releasever&arch=$basearch
+enabled=0
+enabled_metadata=0
 type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-updates-debuginfo]
 name=RPM Fusion for Fedora $releasever - Free - Updates Debug
-#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/updates/$releasever/$basearch/debug/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-debug-$releasever&arch=$basearch
 enabled=0
 type=rpm-md
 gpgcheck=1
@@ -21,11 +22,10 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-updates-source]
 name=RPM Fusion for Fedora $releasever - Free - Updates Source
-#baseurl=http://download1.rpmfusion.org/free/fedora/updates/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/updates/$releasever/SRPMS/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-released-source-$releasever&arch=$basearch
 enabled=0
 type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-

katsu/modules/base/repodir/rpmfusion-free.repo

@@ -1,7 +1,9 @@
+# TODO: We're bypassing their mirrors because they're broken atm
+# you'll also want to change "development" in the baseurl link to "releases" once Fedora 41 is released
 [rpmfusion-free]
 name=RPM Fusion for Fedora $releasever - Free
-#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/development/$releasever/Everything/$basearch/os/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$releasever&arch=$basearch
 enabled=1
 metadata_expire=14d
 type=rpm-md
@@ -11,8 +13,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-debuginfo]
 name=RPM Fusion for Fedora $releasever - Free - Debug
-#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/development/$releasever/Everything/$basearch/debug/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
@@ -22,12 +24,11 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
 
 [rpmfusion-free-source]
 name=RPM Fusion for Fedora $releasever - Free - Source
-#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/source/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/free/fedora/development/$releasever/Everything/source/SRPMS/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
-

katsu/modules/base/repodir/rpmfusion-nonfree-tainted.repo

@@ -1,7 +1,8 @@
+# TODO: We're bypassing their mirrors because they're broken atm
 [rpmfusion-nonfree-tainted]
 name=RPM Fusion for Fedora $releasever - Nonfree tainted
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-$releasever&arch=$basearch
 enabled=1
 metadata_expire=14d
 type=rpm-md
@@ -11,8 +12,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-tainted-debuginfo]
 name=RPM Fusion for Fedora $releasever - Nonfree tainted - Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-debug-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/$basearch/debug/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
@@ -22,12 +23,11 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-tainted-source]
 name=RPM Fusion for Fedora $releasever - Nonfree tainted - Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-source-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/tainted/$releasever/SRPMS/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-tainted-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-

katsu/modules/base/repodir/rpmfusion-nonfree-updates.repo

@@ -1,18 +1,19 @@
+# TODO: We're bypassing their mirrors because they're broken atm
 [rpmfusion-nonfree-updates]
 name=RPM Fusion for Fedora $releasever - Nonfree - Updates
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
-enabled=1
-enabled_metadata=1
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-$releasever&arch=$basearch
+enabled=0
+enabled_metadata=0
 type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-updates-debuginfo]
 name=RPM Fusion for Fedora $releasever - Nonfree - Updates Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-debug-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/$basearch/debug/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-debug-$releasever&arch=$basearch
 enabled=0
 type=rpm-md
 gpgcheck=1
@@ -21,11 +22,10 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-updates-source]
 name=RPM Fusion for Fedora $releasever - Nonfree - Updates Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-source-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/updates/$releasever/SRPMS/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updates-released-source-$releasever&arch=$basearch
 enabled=0
 type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-

katsu/modules/base/repodir/rpmfusion-nonfree.repo

@@ -1,7 +1,9 @@
+# TODO: We're bypassing their mirrors because they're broken atm
+# you'll also want to change "development" in the baseurl link to "releases" once Fedora 41 is released
 [rpmfusion-nonfree]
 name=RPM Fusion for Fedora $releasever - Nonfree
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/development/$releasever/Everything/$basearch/os/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$releasever&arch=$basearch
 enabled=1
 enabled_metadata=1
 metadata_expire=14d
@@ -12,8 +14,8 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-debuginfo]
 name=RPM Fusion for Fedora $releasever - Nonfree - Debug
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/debug/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-debug-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/development/$releasever/Everything/$basearch/debug/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-debug-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
@@ -23,12 +25,11 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
 
 [rpmfusion-nonfree-source]
 name=RPM Fusion for Fedora $releasever - Nonfree - Source
-#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/source/SRPMS/
-metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-source-$releasever&arch=$basearch
+baseurl=https://download1.rpmfusion.org/nonfree/fedora/development/$releasever/Everything/source/SRPMS/
+#metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-source-$releasever&arch=$basearch
 enabled=0
 metadata_expire=7d
 type=rpm-md
 gpgcheck=1
 repo_gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-nonfree-fedora-$releasever
-

katsu/modules/flagship/base-disk-aarch64.yaml

@@ -1,5 +1,5 @@
 builder: dnf
-distro: Ultramarine Linux 40 (Flagship Edition)
+distro: Ultramarine Linux 41 (Flagship Edition)
 
 # users:
 #   - username: ultramarine
@@ -43,5 +43,6 @@ disk:
       mountpoint: /
 
 dnf:
-  releasever: 40
+  releasever: 41
+  exec: dnf4
   arch: aarch64