fix: use dnf4 because of dnf5 comps issue

Ultramarine-Linux · Aug 19, 2024 · a5ab9b3 · a5ab9b3
1 parent 796fdd5
commit a5ab9b3
Show file tree

Hide file tree

Showing 54 changed files with 55 additions and 0 deletions.
diff --git a/katsu/modules/base/base-disk-aarch64.yaml b/katsu/modules/base/base-disk-aarch64.yaml
@@ -14,6 +14,8 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
+exec: dnf4
   arch: aarch64
   packages:
     - ultramarine-release-identity-basic

diff --git a/katsu/modules/base/base-disk-x86_64.yaml b/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

diff --git a/katsu/modules/base/base-disk.yaml b/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

diff --git a/katsu/modules/base/base-docker-aarch64.yaml b/katsu/modules/base/base-docker-aarch64.yaml
@@ -6,4 +6,5 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: aarch64
diff --git a/katsu/modules/base/base-docker-x86_64.yaml b/katsu/modules/base/base-docker-x86_64.yaml
@@ -6,4 +6,5 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: x86_64
diff --git a/katsu/modules/base/base-docker.yaml b/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

diff --git a/katsu/modules/base/base.yaml b/katsu/modules/base/base.yaml
@@ -14,6 +14,7 @@ scripts:
 
 dnf:
   releasever: 41
+  exec: dnf4
   repodir: repodir
   options:
     - --setopt=cachedir=/var/cache/dnf

diff --git a/katsu/modules/flagship/base-disk-aarch64.yaml b/katsu/modules/flagship/base-disk-aarch64.yaml
@@ -44,4 +44,5 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: aarch64
diff --git a/katsu/modules/flagship/base-disk-x86_64.yaml b/katsu/modules/flagship/base-disk-x86_64.yaml
@@ -44,3 +44,4 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/flagship/flagship-live.yaml b/katsu/modules/flagship/flagship-live.yaml
@@ -24,3 +24,4 @@ scripts:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/flagship/flagship.yaml b/katsu/modules/flagship/flagship.yaml
@@ -6,6 +6,7 @@ scripts:
 
 dnf:
   releasever: 41
+  exec: dnf4
   exclude:
     - budgie-desktop-defaults
     - budgie-backgrounds

diff --git a/katsu/modules/gnome/base-disk-aarch64.yaml b/katsu/modules/gnome/base-disk-aarch64.yaml
@@ -44,4 +44,5 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: aarch64
diff --git a/katsu/modules/gnome/base-disk-x86_64.yaml b/katsu/modules/gnome/base-disk-x86_64.yaml
@@ -44,3 +44,4 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/gnome/gnome-live.yaml b/katsu/modules/gnome/gnome-live.yaml
@@ -24,3 +24,4 @@ scripts:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/gnome/gnome.yaml b/katsu/modules/gnome/gnome.yaml
@@ -1,5 +1,6 @@
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     - "@ultramarine-gnome-product-environment"
     - ultramarine-release-gnome

diff --git a/katsu/modules/kde/base-disk-aarch64.yaml b/katsu/modules/kde/base-disk-aarch64.yaml
@@ -45,4 +45,5 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: aarch64
diff --git a/katsu/modules/kde/base-disk-x86_64.yaml b/katsu/modules/kde/base-disk-x86_64.yaml
@@ -45,3 +45,4 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/kde/kde-disk.yaml b/katsu/modules/kde/kde-disk.yaml
@@ -1,4 +1,5 @@
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     - initial-setup-gui-wayland-plasma # Use KWin version of initial-setup
diff --git a/katsu/modules/kde/kde-live.yaml b/katsu/modules/kde/kde-live.yaml
@@ -24,3 +24,4 @@ iso:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/kde/kde.yaml b/katsu/modules/kde/kde.yaml
@@ -1,5 +1,6 @@
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     #beta - still need to set up our own comps
     - "@ultramarine-kde-product-environment"
diff --git a/katsu/modules/live/live.yaml b/katsu/modules/live/live.yaml
@@ -5,6 +5,7 @@ scripts:
       file: live.sh
 dnf:
   releasever: 41
+  exec: dnf4
   exclude:
     - fedora-release*
     - generic-release*

diff --git a/katsu/modules/pantheon/base-disk-aarch64.yaml b/katsu/modules/pantheon/base-disk-aarch64.yaml
@@ -44,4 +44,5 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: aarch64
diff --git a/katsu/modules/pantheon/base-disk-x86_64.yaml b/katsu/modules/pantheon/base-disk-x86_64.yaml
@@ -44,3 +44,4 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/pantheon/pantheon-live.yaml b/katsu/modules/pantheon/pantheon-live.yaml
@@ -23,3 +23,4 @@ iso:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/pantheon/pantheon.yaml b/katsu/modules/pantheon/pantheon.yaml
@@ -2,6 +2,7 @@ builder: dnf
 
 dnf:
   releasever: 41
+  exec: dnf4
   exclude:
     - gnome-tour
     - gnome-shell

diff --git a/katsu/modules/ports/chromebook/chromebook.yaml b/katsu/modules/ports/chromebook/chromebook.yaml
@@ -18,6 +18,7 @@ scripts:
 
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     - cros-keyboard-map
     - depthcharge-tools

diff --git a/katsu/modules/ports/chromebook/mt8183/flagship.yaml b/katsu/modules/ports/chromebook/mt8183/flagship.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/mt8183/gnome.yaml b/katsu/modules/ports/chromebook/mt8183/gnome.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/mt8183/kde.yaml b/katsu/modules/ports/chromebook/mt8183/kde.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/mt8183/mt8183.yaml b/katsu/modules/ports/chromebook/mt8183/mt8183.yaml
@@ -5,6 +5,7 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     - kernel-mt8183
     - kernel-mt8183-devel
diff --git a/katsu/modules/ports/chromebook/mt8183/xfce.yaml b/katsu/modules/ports/chromebook/mt8183/xfce.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/mt8192/flagship.yaml b/katsu/modules/ports/chromebook/mt8192/flagship.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/mt8192/gnome.yaml b/katsu/modules/ports/chromebook/mt8192/gnome.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/mt8192/kde.yaml b/katsu/modules/ports/chromebook/mt8192/kde.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/mt8192/mt8192.yaml b/katsu/modules/ports/chromebook/mt8192/mt8192.yaml
@@ -5,6 +5,7 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     - kernel-mt8192
     - kernel-mt8192-devel
diff --git a/katsu/modules/ports/chromebook/mt8192/xfce.yaml b/katsu/modules/ports/chromebook/mt8192/xfce.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/sc7180/flagship.yaml b/katsu/modules/ports/chromebook/sc7180/flagship.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/sc7180/gnome.yaml b/katsu/modules/ports/chromebook/sc7180/gnome.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/sc7180/kde.yaml b/katsu/modules/ports/chromebook/sc7180/kde.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/sc7180/sc7180.yaml b/katsu/modules/ports/chromebook/sc7180/sc7180.yaml
@@ -5,6 +5,7 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     - kernel-sc7180
     - kernel-sc7180-devel
diff --git a/katsu/modules/ports/chromebook/sc7180/xfce.yaml b/katsu/modules/ports/chromebook/sc7180/xfce.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/stoney/flagship.yaml b/katsu/modules/ports/chromebook/stoney/flagship.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/stoney/gnome.yaml b/katsu/modules/ports/chromebook/stoney/gnome.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/stoney/kde.yaml b/katsu/modules/ports/chromebook/stoney/kde.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/stoney/stoney.yaml b/katsu/modules/ports/chromebook/stoney/stoney.yaml
@@ -5,6 +5,7 @@ import:
 
 dnf:
   releasever: 41
+  exec: dnf4
   packages:
     - kernel-stoneyridge
     - kernel-stoneyridge-devel
diff --git a/katsu/modules/ports/chromebook/stoney/xfce.yaml b/katsu/modules/ports/chromebook/stoney/xfce.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/x86_64/flagship.yaml b/katsu/modules/ports/chromebook/x86_64/flagship.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/x86_64/gnome.yaml b/katsu/modules/ports/chromebook/x86_64/gnome.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/x86_64/kde.yaml b/katsu/modules/ports/chromebook/x86_64/kde.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/ports/chromebook/x86_64/xfce.yaml b/katsu/modules/ports/chromebook/x86_64/xfce.yaml
@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/xfce/base-disk-aarch64.yaml b/katsu/modules/xfce/base-disk-aarch64.yaml
@@ -44,4 +44,5 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
   arch: aarch64
diff --git a/katsu/modules/xfce/base-disk-x86_64.yaml b/katsu/modules/xfce/base-disk-x86_64.yaml
@@ -44,3 +44,4 @@ disk:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/xfce/xfce-live.yaml b/katsu/modules/xfce/xfce-live.yaml
@@ -24,3 +24,4 @@ scripts:
 
 dnf:
   releasever: 41
+  exec: dnf4
diff --git a/katsu/modules/xfce/xfce.yaml b/katsu/modules/xfce/xfce.yaml
@@ -6,6 +6,7 @@ scripts:
 
 dnf:
   releasever: 41
+  exec: dnf4
   exclude:
     - ultramarine-backgrounds-compat
     - "dnfdragora*" # Jade doesn't like this for some reason???
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,3 +44,4 @@ disk:

		dnf:
		releasever: 41
		exec: dnf4
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,3 +24,4 @@ scripts:

		dnf:
		releasever: 41
		exec: dnf4
Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,3 +45,4 @@ disk:

		dnf:
		releasever: 41
		exec: dnf4
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,4 @@ kernel_cmdline: "quiet rhgb"

		dnf:
		releasever: 41
		exec: dnf4